fmui-base 2.0.59 → 2.0.61

package/lib/db/db.js

@@ -987,6 +987,13 @@ context.create('portal', {
         duration: 800
       });
     }
+  },
+  // 移动应用保存更新点击次数接口
+  saveAppCount: {
+    mockUrl: 'query/saveAppCount.json',
+    url: _variables2.default.URLS.saveAppCount,
+    method: 'POST',
+    willFetch: function willFetch() {}
   }
 });
 

package/lib/db/variables.js

@@ -115,7 +115,8 @@ exports.default = {
         getNewHomePageTodoData: portalAllUrlPrefix + "getNewHomePageTodoData" + '?token=' + getLoginUserInfo().token,
         getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,
-        getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token //获取首页常用应用
+        getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token, //获取首页常用应用
+        saveAppCount: portalAllUrlPrefix + "saveAppCount" + '?token=' + getLoginUserInfo().token //移动应用保存更新点击次数接口 
 
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",

package/lib/poppage/tree/tree.js

@@ -187,9 +187,9 @@ var Page = function (_React$Component2) {
     //this.initData();
 
 
-    /*// 子组件初始化
-    initState() {
-     }*/
+    /*// 子组件初始化
+    initState() {
+      }*/
 
     //初始化数据
 

package/lib/react_grid/react_grid.js

@@ -109,6 +109,8 @@ var MyGrid = function (_React$Component) {
             if (item.portletCode == 'banner') {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
               _this.getRemindCount();
+            } else if (item.portletCode == 'image') {
+              _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
             } else if (item.portletCode == 'cyyy') {
               t.getShoucangAppInfo(item.id);
               t.getComAppInfo(item.id);
@@ -221,6 +223,9 @@ var MyGrid = function (_React$Component) {
       bannerPicPath: '',
       activeIndex: 2,
       undo: 0, //待办数量
+      approveundo: 0, //审批数量
+      toBeAttendedCount: 0, //会议数量
+      unreadPubMailCount: 0, //未读公共邮件
       appOftenList: [], //常用应用
       collectAppInfoList: [], //收藏应用
       bssx: [], // 办事事项
@@ -286,10 +291,16 @@ var MyGrid = function (_React$Component) {
     value: function getRemindCount() {
       var _this2 = this;
 
-      _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo" }).then(function (content) {
-        if (content.undo) {
+      _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('====================================');
           _this2.setState({
-            undo: content.undo
+            undo: content.undo,
+            approveundo: content.approveundo,
+            toBeAttendedCount: content.toBeAttendedCount,
+            unreadPubMailCount: content.unreadPubMailCount
           });
         }
       });
@@ -387,10 +398,13 @@ var MyGrid = function (_React$Component) {
 
   }, {
     key: 'newPageSkip',
-    value: function newPageSkip(dingUrl, wxUrl, mhUrl, cocallUrl) {
+    value: function newPageSkip(dingUrl, wxUrl, mhUrl, cocallUrl, id) {
       var dingVal = "DING";
       var wxVal = "WX";
       var mhVal = "MH";
+      _db2.default.portal.saveAppCount({ mobileAppId: id }).then(function (content) {}).catch(function (err) {
+        console.log(err);
+      });
 
       var data = getLoginUserInfo();
       var thirdMenuType = data.thirdMenuType;
@@ -611,6 +625,11 @@ var MyGrid = function (_React$Component) {
         componentContent = _react2.default.createElement(
           'div',
           { className: 'react-grid-banner' },
+          _react2.default.createElement(
+            'div',
+            { className: 'react-grid-banner-img' },
+            _react2.default.createElement('img', { src: pathUrl })
+          ),
           _react2.default.createElement(
             'div',
             { className: 'global-search' },
@@ -653,8 +672,8 @@ var MyGrid = function (_React$Component) {
                   { className: 'react-grid-banner-item' },
                   _react2.default.createElement(
                     _Badge2.default,
-                    { count: item == 'daiban' ? t.state.undo : '' },
-                    _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb ' + todoInfo.icon })
+                    { count: item == 'daiban' ? t.state.undo : '', className: item + 'color' },
+                    _react2.default.createElement('i', { className: 'iconfont-ywtb ' + todoInfo.icon })
                   )
                 ),
                 _react2.default.createElement(
@@ -667,23 +686,24 @@ var MyGrid = function (_React$Component) {
           )
         );
         // backgroundImage直接判断有无会报错，单独return
-        return _react2.default.createElement(
-          'div',
-          { className: 'react-grid-component', key: item.id, style: {
-              borderTopLeftRadius: _styleSetting.otherSet.radius.topLeft + 'px',
-              borderTopRightRadius: _styleSetting.otherSet.radius.topRight + 'px',
-              borderBottomLeftRadius: _styleSetting.otherSet.radius.bottomLeft + 'px',
-              borderBottomRightRadius: _styleSetting.otherSet.radius.bottomRight + 'px',
-              paddingLeft: _styleSetting.otherSet.paddingSet.pl + 'px',
-              paddingright: _styleSetting.otherSet.paddingSet.pr + 'px',
-              paddingTop: _styleSetting.otherSet.paddingSet.pt + 'px',
-              paddingBottom: _styleSetting.otherSet.paddingSet.pb + 'px',
-              backgroundColor: _styleSetting.otherSet.bgColor,
-              backgroundImage: 'url(' + pathUrl + ')'
-            } },
-          _styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
-          componentContent
-        );
+        {
+          return _react2.default.createElement(
+            'div',
+            { className: 'react-grid-component banner', key: item.id, style: {
+                borderTopLeftRadius: _styleSetting.otherSet.radius.topLeft + 'px',
+                borderTopRightRadius: _styleSetting.otherSet.radius.topRight + 'px',
+                borderBottomLeftRadius: _styleSetting.otherSet.radius.bottomLeft + 'px',
+                borderBottomRightRadius: _styleSetting.otherSet.radius.bottomRight + 'px',
+                paddingLeft: _styleSetting.otherSet.paddingSet.pl + 'px',
+                paddingright: _styleSetting.otherSet.paddingSet.pr + 'px',
+                paddingTop: _styleSetting.otherSet.paddingSet.pt + 'px',
+                paddingBottom: _styleSetting.otherSet.paddingSet.pb + 'px',
+                backgroundColor: _styleSetting.otherSet.bgColor
+              } },
+            _styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
+            componentContent
+          );
+        }
       }
       if (item.portletCode === 'cyyy') {
         componentContent = _react2.default.createElement(
@@ -709,7 +729,11 @@ var MyGrid = function (_React$Component) {
                     _react2.default.createElement(
                       'div',
                       { className: 'iconblock t-iconBC' + ele.iconColor },
-                      _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
+                      _react2.default.createElement(
+                        _Badge2.default,
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
+                      )
                     ),
                     _react2.default.createElement(
                       'p',
@@ -720,10 +744,10 @@ var MyGrid = function (_React$Component) {
                 }),
                 _react2.default.createElement(
                   'div',
-                  { className: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols * 1, item.id) },
+                  { className: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "/apppage/1", personalSetting.cols * 1, item.id) },
                   _react2.default.createElement(
                     'div',
-                    { className: 'iconblock t-iconBCred' },
+                    { className: 'iconblock t-gengduo' },
                     _react2.default.createElement('i', { className: 'iconfont-ywtb' + ' icon-ywtb-gengduo' })
                   ),
                   _react2.default.createElement(
@@ -755,7 +779,11 @@ var MyGrid = function (_React$Component) {
                     _react2.default.createElement(
                       'div',
                       { className: 'iconblock t-iconBC' + ele.iconColor },
-                      _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
+                      _react2.default.createElement(
+                        _Badge2.default,
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
+                      )
                     ),
                     _react2.default.createElement(
                       'p',
@@ -769,7 +797,7 @@ var MyGrid = function (_React$Component) {
                   { className: 'systemItem', onClick: t.jumpPage.bind(this, "/appCollect") },
                   _react2.default.createElement(
                     'div',
-                    { className: 'iconblock t-iconBCred' },
+                    { className: 'iconblock t-gengduo' },
                     _react2.default.createElement('i', { className: 'iconfont-ywtb' + ' icon-ywtb-gengduo' })
                   ),
                   _react2.default.createElement(
@@ -788,13 +816,13 @@ var MyGrid = function (_React$Component) {
         );
       }
       if (item.portletCode === 'bssx') {
-        var bssxShowList = personalSetting.showModule;
+        var bssxShowList = personalSetting.codes;
         // let styleSetting = JSON.parse(item.styleSetting)
 
-        var perList = '';
+        var commonList = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].perList && t.state[item.portletCode + '_' + item.id].perList.length > 0) {
-            perList = t.state[item.portletCode + '_' + item.id].perList.map(function (item) {
+          if (t.state[item.portletCode + '_' + item.id].common && t.state[item.portletCode + '_' + item.id].common.length > 0) {
+            commonList = t.state[item.portletCode + '_' + item.id].common.map(function (item) {
               return _react2.default.createElement(
                 'div',
                 { className: 'banshi-item', onClick: function onClick() {
@@ -815,17 +843,17 @@ var MyGrid = function (_React$Component) {
               );
             });
           } else {
-            perList = _react2.default.createElement(
+            commonList = _react2.default.createElement(
               'div',
               null,
               _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }
-        var orgList = '';
+        var colectionList = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].orgList && t.state[item.portletCode + '_' + item.id].orgList.length > 0) {
-            orgList = t.state[item.portletCode + '_' + item.id].orgList.map(function (item) {
+          if (t.state[item.portletCode + '_' + item.id].colection && t.state[item.portletCode + '_' + item.id].colection.length > 0) {
+            colectionList = t.state[item.portletCode + '_' + item.id].colection.map(function (item) {
               return _react2.default.createElement(
                 'div',
                 { className: 'banshi-item', onClick: function onClick() {
@@ -846,42 +874,42 @@ var MyGrid = function (_React$Component) {
               );
             });
           } else {
-            orgList = _react2.default.createElement(
+            colectionList = _react2.default.createElement(
               'div',
               null,
               _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }
-        var bssxPerTab = '';
-        if (bssxShowList.indexOf('personWork') > -1) {
-          bssxPerTab = _react2.default.createElement(
+        var bssxCommonTab = '';
+        if (bssxShowList.indexOf('common') > -1) {
+          bssxCommonTab = _react2.default.createElement(
             _Tab2.default.Item,
             { title: _react2.default.createElement(
                 'div',
                 { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
-                '\u4E2A\u4EBA\u529E\u4E8B'
+                '\u5E38\u7528\u4E8B\u9879'
               ), key: 0 },
             _react2.default.createElement(
               'div',
               { className: 'banshi-list' },
-              perList
+              commonList
             )
           );
         }
-        var bssxOrgTab = '';
-        if (bssxShowList.indexOf('deptWork') > -1) {
-          bssxOrgTab = _react2.default.createElement(
+        var bssxColectionTab = '';
+        if (bssxShowList.indexOf('colection') > -1) {
+          bssxColectionTab = _react2.default.createElement(
             _Tab2.default.Item,
             { key: 1, title: _react2.default.createElement(
                 'div',
                 { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
-                '\u90E8\u95E8\u529E\u4E8B'
+                '\u6211\u7684\u6536\u85CF'
               ) },
             _react2.default.createElement(
               'div',
               { className: 'banshi-list' },
-              orgList
+              colectionList
             )
           );
         }
@@ -896,9 +924,9 @@ var MyGrid = function (_React$Component) {
           ),
           _react2.default.createElement(
             _Tab2.default,
-            { activeKey: bssxShowList.indexOf('personWork') > -1 ? "0" : "1" },
-            bssxPerTab,
-            bssxOrgTab
+            { activeKey: bssxShowList.indexOf('common') > -1 ? "0" : "1" },
+            bssxCommonTab,
+            bssxColectionTab
           )
         );
       }
@@ -1479,19 +1507,48 @@ var MyGrid = function (_React$Component) {
           )
         );
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
-          componentContent = _react2.default.createElement(
-            _Grid2.default,
-            { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
-            t.state[item.portletCode + '_' + item.id].map(function (item) {
-              return _react2.default.createElement(
-                'button',
-                { onClick: function onClick() {
-                    _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
-                  } },
-                item.name
-              );
-            })
-          );
+          // 文字模式
+          if (personalSetting.styleType == '1') {
+            componentContent = _react2.default.createElement(
+              _Grid2.default,
+              { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
+              t.state[item.portletCode + '_' + item.id].map(function (item) {
+                return _react2.default.createElement(
+                  'button',
+                  { onClick: function onClick() {
+                      _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
+                    } },
+                  item.name
+                );
+              })
+            );
+          }
+
+          if (personalSetting.styleType == '2') {
+            // 卡片模式
+            componentContent = _react2.default.createElement(
+              _Grid2.default,
+              { col: personalSetting.cols * 1, className: 'lcfq-list' },
+              t.state[item.portletCode + '_' + item.id].map(function (item) {
+                return _react2.default.createElement(
+                  'div',
+                  { className: 'lcfq-list-item', onClick: function onClick() {
+                      _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
+                    } },
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'lcfq-list-item-icon' },
+                    _react2.default.createElement('i', { className: "iconfont-ywtb icon-ywtb-" + item.icon })
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'lcfq-list-item-text' },
+                    item.name
+                  )
+                );
+              })
+            );
+          }
         }
       }
       if (item.portletCode === 'tbgl') {
@@ -1611,7 +1668,7 @@ var MyGrid = function (_React$Component) {
               { title: '\u6807\u9898', code: item.code, className: 't-image-slide-item t-R10', style: { backgroundImage: 'url(' + imgUrlPath + ')' } },
               _react2.default.createElement(
                 'p',
-                { className: 't-FS20 t-ML20 t-PT20 t-MB10' },
+                { className: 't-FS20 t-PT20 t-MB10', style: { textAlign: 'center' } },
                 item.name
               )
             );
@@ -1627,9 +1684,41 @@ var MyGrid = function (_React$Component) {
           );
         }
       }
+      if (item.portletCode === 'image') {
+        var tppathUrl = "";
+        var tpUrlId = "";
+        componentHead = _react2.default.createElement(
+          'div',
+          null,
+          _react2.default.createElement(
+            'p',
+            { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
+            '\u66F4\u591A',
+            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
+          ),
+          _react2.default.createElement(
+            _Tab2.default,
+            { activeKey: '0', className: 't-MB16' },
+            _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
+                'div',
+                { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
+                item.title
+              ), key: '0' })
+          )
+        );
+        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].imgId) {
+          tpUrlId = t.state[item.portletCode + '_' + item.id].imgId;
+          tppathUrl = localStorage.getItem('context') + '/api/m/plugin/attachment/mobile/viewImage?token=' + localStorage.getItem('token') + '&fid=' + tpUrlId;
+          componentContent = _react2.default.createElement(
+            'div',
+            { className: 'tp-content' },
+            _react2.default.createElement('img', { src: tppathUrl, alt: '' })
+          );
+        }
+      }
       return _react2.default.createElement(
         'div',
-        { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component' : 'noTitle', key: item.id, style: {
+        { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component' : 'react-grid-component noTitle', key: item.id, style: {
             borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
             borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
             borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',