fmui-base 2.0.76 → 2.0.78

package/lib/react_grid/react_grid copy.js

@@ -112,8 +112,9 @@ var MyGrid = function (_React$Component) {
             } else if (item.portletCode == 'image') {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
             } else if (item.portletCode == 'cyyy') {
+              var cyyyCols = JSON.parse(item.personalSetting).cols;
               t.getShoucangAppInfo(item.id);
-              t.getOftenList(item.id);
+              t.getOftenList(item.id, cyyyCols);
               _this.getRemindCount();
             } else if (item.portletCode !== 'tbgl') {
               var _params = {
@@ -161,10 +162,10 @@ var MyGrid = function (_React$Component) {
       }).catch(function (error) {});
     };
 
-    _this.getOftenList = function (id) {
+    _this.getOftenList = function (id, cyyyCols) {
       var data = getLoginUserInfo();
       var thirdMenuType = data.thirdMenuType;
-      var params = { code: "cyyy" };
+      var params = { code: "cyyy", cols: cyyyCols };
       if (thirdMenuType == null || thirdMenuType == 'null' || thirdMenuType == undefined || thirdMenuType == 'undefined') {
         thirdMenuType = 'DING';
       }
@@ -637,11 +638,11 @@ var MyGrid = function (_React$Component) {
         }
         componentContent = _react2.default.createElement(
           'div',
-          { className: 'react-grid-banner' },
+          { className: personalSetting.styleType == '1' ? "react-grid-banner react-grid-banner-type1" : "react-grid-banner react-grid-banner-type2" },
           _react2.default.createElement(
             'div',
-            { className: 'react-grid-banner-img' },
-            _react2.default.createElement('img', { src: pathUrl })
+            { className: 'react-grid-banner-img ' },
+            _react2.default.createElement('img', { src: pathUrl, onerror: 'this.src=\'../../../fmui/images/defaultHome.png\';this.onerror=null' })
           ),
           _react2.default.createElement(
             'div',
@@ -679,7 +680,7 @@ var MyGrid = function (_React$Component) {
               var todoInfo = projectMenuUrl.todoInfo[item];
               return _react2.default.createElement(
                 'div',
-                { className: 'react-grid-banner-type1', onClick: t.skip2Project.bind(this, todoInfo.moduleCode, todoInfo.url) },
+                { className: personalSetting.styleType == '1' ? "react-grid-banner react-grid-banner-type1" : "react-grid-banner react-grid-banner-type2", onClick: t.skip2Project.bind(this, todoInfo.moduleCode, todoInfo.url) },
                 _react2.default.createElement(
                   'div',
                   { className: 'react-grid-banner-item' },
@@ -721,7 +722,7 @@ var MyGrid = function (_React$Component) {
       if (item.portletCode === 'cyyy') {
         componentContent = _react2.default.createElement(
           'div',
-          { className: 'react-app-collect' },
+          { className: personalSetting.styleType == '1' ? 'react-app-collect react-app-collect-type1' : 'react-app-collect react-app-collect-type2' },
           _react2.default.createElement(
             _Tab2.default,
             { activeKey: '0' },
@@ -843,14 +844,9 @@ var MyGrid = function (_React$Component) {
                   } },
                 _react2.default.createElement(
                   'div',
-                  { className: 'title t-omit' },
+                  { className: 'title' },
                   item.name
                 ),
-                _react2.default.createElement(
-                  'div',
-                  { className: 'describe t-omit' },
-                  item.categoryName
-                ),
                 _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' bg' }),
                 _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' ic' })
               );
@@ -1676,21 +1672,13 @@ var MyGrid = function (_React$Component) {
           _carouselItem = t.state[item.portletCode + '_' + item.id].map(function (item) {
             var imgUrlPath = localStorage.getItem('context') + '/api/m/plugin/attachment/mobile/viewImage?token=' + localStorage.getItem('token') + '&fid=' + item.imgUrl;
 
-            return _react2.default.createElement(
-              _Carousel2.default.Item,
-              { 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-PT20 t-MB10', style: { textAlign: 'center' } },
-                item.name
-              )
-            );
+            return _react2.default.createElement(_Carousel2.default.Item, { title: '\u6807\u9898', code: item.code, className: 't-image-slide-item t-R10', style: { backgroundImage: 'url(' + imgUrlPath + ')' } });
           });
         }
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           componentContent = _react2.default.createElement(
             _Carousel2.default,
-            { showNav: true, height: '91px', auto: false, className: 'jxzt-content', onSlideClick: function onSlideClick(option) {
+            { showNav: true, auto: false, className: 'jxzt-content', onSlideClick: function onSlideClick(option) {
                 t.skip2Zhuanti(option);
               } },
             _carouselItem
@@ -1803,7 +1791,7 @@ var MyGrid = function (_React$Component) {
                 width: window.innerWidth,
                 isDraggable: this.state.isDraggable,
                 margin: [0, 15],
-                containerPadding: [8, 8]
+                containerPadding: [8, 0]
               },
               this.state.data.map(function (item) {
                 return t.portalContent(item) || null;

package/lib/react_grid/react_grid.js

@@ -101,11 +101,16 @@ var MyGrid = function (_React$Component) {
       var t = _this;
       // 部件的初始化信息
       _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
-        if (res && res.length > 0) {
+        if (res) {
+          var pageTitle = res.portalTitle;
+          if (!pageTitle || pageTitle == '') {
+            pageTitle = '一网通办管理平台';
+          }
+          setPageTitle(pageTitle);
           _this.setState({
-            data: res
+            data: res.portlet
           });
-          res.map(function (item) {
+          res.portlet.map(function (item) {
             if (item.portletCode == 'banner') {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
               _this.getRemindCount();
@@ -146,11 +151,6 @@ var MyGrid = function (_React$Component) {
         var openModule = content.hpOpenModule ? content.hpOpenModule : "";
         localStorage.setItem('hpOpenModule', openModule);
         // let todoData = content.todoData != null ? content.todoData.entity : {};
-        // let pageTitle = todoData.pageTitle;
-        // if (!pageTitle || pageTitle == '') {
-        //   pageTitle = '一网通办管理平台'
-        // }
-        // setPageTitle(pageTitle);
       });
     };
 
@@ -1276,7 +1276,7 @@ var MyGrid = function (_React$Component) {
         }
         componentContent = _react2.default.createElement(
           'div',
-          null,
+          { 'class': 'component-bssx' },
           t.state['activeIndex_ggyj_' + item.id] && t.state['activeIndex_ggyj_' + item.id] === true ? _react2.default.createElement(
             'p',
             { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },

package/lib/react_grid/react_grid.less

@@ -108,7 +108,7 @@
         position: absolute;
         // width: 114%;
         width: calc(100% + 16px);
-        height: 130px;
+        height: 120px;
         // left: -14%;
         left: -8px;
         right: 0;
@@ -118,7 +118,7 @@
         // width: 114%;
         width: 100%;
         height: 100%;
-        border-radius: 0 0 39% 39%;
+        border-radius: 0 0 42% 42%;
         }
       }
 
@@ -1305,7 +1305,7 @@
   }
 
   .t-grid {
-    margin: 0 8px;
+    margin: 0;
     border-top: none !important;
 
     .t-grid-row {

package/package.json

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