fmui-base 2.0.48 → 2.0.50

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.50：移动门户部件标题修改
+- 2.0.49：移动门户图表组件修改
 - 2.0.48：移动门户组件修改
 - 2.0.47：移动端默认传阅
 - 2.0.46：移动门户图表组件单维表多维表不支持提示

package/lib/chart/chart.js

@@ -36,9 +36,17 @@ var NoData = function (_React$Component) {
 
         var portalId = props.portalId;
         var height = props.height;
+        var hasTitle = props.hasTitle ? props.height : false;
         if (!height) {
             height = 400;
         }
+        if (hasTitle) {
+            if ((height + "").indexOf("%") > 0) {
+                height = "calc(" + height + " - 50px)";
+            } else {
+                height = height - 50;
+            }
+        }
         _this.state = {
             loadTrue: false,
             portalId: portalId,

package/lib/css/react_grid.css

@@ -2,21 +2,21 @@
   display: none;
 }
 .react-grid .t-tab-bar {
-  padding-left: 6px;
+  padding-left: 10px;
 }
 .react-grid .t-tab-bar .t-tab-tab {
   font-size: 16px;
   min-width: 95px;
   color: #888;
   flex: initial;
-  padding: 0 10px;
   height: 33px;
   line-height: 20px;
   display: block;
   background-color: transparent;
 }
 .react-grid .t-tab-bar .t-tab-tab div {
-  max-width: 81px;
+  max-width: 95px;
+  padding: 0 5px;
   height: inherit;
   white-space: nowrap;
   overflow: hidden;
@@ -29,7 +29,7 @@
   font-size: 18px;
 }
 .react-grid .t-tab-ink-bar {
-  margin-left: -36px;
+  margin-left: -38px;
   border-radius: 4px;
   height: 4px;
   width: 25px !important;
@@ -47,7 +47,7 @@
   left: 30px;
 }
 .react-grid .t-tab-nav-wrap .t-tab-ink-bar {
-  margin-left: -28px;
+  margin-left: -31px;
 }
 .react-grid .react-grid-item.cssTransforms {
   overflow: auto;
@@ -358,9 +358,12 @@
   border-radius: 5px;
 }
 .react-grid .carousel-notice.t-slide .t-slide-item {
-  padding: 16px;
   background-size: 100% 100%;
 }
+.react-grid .carousel-notice.t-slide .t-slide-item-inner {
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
 .react-grid .carousel-notice.t-slide .t-slide-item img {
   display: none;
 }
@@ -785,6 +788,9 @@
 .react-grid .list-RT-label .list-item .item-title::before {
   background: #713938;
 }
+.react-grid .list-RT-label .list-item {
+  margin: 10px 16px;
+}
 .react-grid .rightMore {
   position: absolute;
   right: 10px;
@@ -824,3 +830,6 @@
   align-items: flex-start;
   justify-content: initial;
 }
+.react-grid .t-grid-item + .t-grid-item {
+  border-left: none !important;
+}

package/lib/react_grid/react_grid.js

@@ -556,6 +556,9 @@ var MyGrid = function (_React$Component) {
         }
       }
     }
+
+    // 区分个人邮件和公共邮件
+
   }, {
     key: 'handleChange',
     value: function handleChange(id, obj) {
@@ -576,6 +579,9 @@ var MyGrid = function (_React$Component) {
         this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
       }
     }
+
+    // 部件内容渲染处理函数
+
   }, {
     key: 'portalContent',
     value: function portalContent(item) {
@@ -658,7 +664,7 @@ var MyGrid = function (_React$Component) {
             }.bind(this)) : ''
           )
         );
-
+        // backgroundImage直接判断有无会报错，单独return
         return _react2.default.createElement(
           'div',
           { className: 'react-grid-component', key: item.id, style: {
@@ -691,10 +697,10 @@ var MyGrid = function (_React$Component) {
                   { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
                   '\u5E38\u7528\u5E94\u7528'
                 ) },
-              _react2.default.createElement(
+              t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
                 _Grid2.default,
                 { col: personalSetting.cols * 1, className: t.state.showcyyy ? '' : 't-DN' },
-                t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? t.state[item.portletCode + '_' + item.id].map(function (ele) {
+                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) },
@@ -709,11 +715,7 @@ var MyGrid = function (_React$Component) {
                       ele.name
                     )
                   );
-                }) : _react2.default.createElement(
-                  'div',
-                  null,
-                  _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
-                ),
+                }),
                 _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) },
@@ -728,6 +730,10 @@ var MyGrid = function (_React$Component) {
                     '\u66F4\u591A'
                   )
                 )
+              ) : _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
               )
             ),
             _react2.default.createElement(
@@ -737,10 +743,10 @@ var MyGrid = function (_React$Component) {
                   { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
                   '\u6211\u7684\u6536\u85CF'
                 ) },
-              _react2.default.createElement(
+              t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
                 _Grid2.default,
                 { col: personalSetting.cols * 1 },
-                t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? t.state['wdsc' + '_' + item.id].map(function (ele) {
+                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) },
@@ -755,14 +761,10 @@ var MyGrid = function (_React$Component) {
                       ele.name
                     )
                   );
-                }) : _react2.default.createElement(
-                  'div',
-                  null,
-                  _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
-                ),
+                }),
                 _react2.default.createElement(
                   'div',
-                  { className: t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "/appCollect") },
+                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "/appCollect") },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -774,6 +776,10 @@ var MyGrid = function (_React$Component) {
                     '\u66F4\u591A'
                   )
                 )
+              ) : _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
               )
             )
           )
@@ -1501,7 +1507,7 @@ var MyGrid = function (_React$Component) {
           )
         );
 
-        componentContent = _react2.default.createElement(_chart2.default, { portalId: item.id, height: '100%' });
+        componentContent = _react2.default.createElement(_chart2.default, { portalId: item.id, height: '100%', hasTitle: styleSetting.titleSet.titleStatus == 1 });
       }
       if (item.portletCode === 'wdsx') {
         componentHead = _react2.default.createElement(

package/lib/react_grid/react_grid.less

@@ -7,7 +7,7 @@
   }
 
   .t-tab-bar {
-    padding-left: 6px;
+    padding-left: 10px;
   }
 
   .t-tab-bar .t-tab-tab {
@@ -15,14 +15,15 @@
     min-width: 95px;
     color: #888;
     flex: initial;
-    padding: 0 10px;
+    // padding: 0 8px;
     height: 33px;
     line-height: 20px;
     display: block;
     background-color: transparent;
 
     div {
-      max-width: 81px;
+      max-width: 95px;
+      padding: 0 5px;
       height: inherit;
       white-space: nowrap;
       overflow: hidden;
@@ -39,7 +40,7 @@
 
   .t-tab-ink-bar {
     // background-color: @theme-color  !important;
-    margin-left: -36px;
+    margin-left: -41px;
     border-radius: 4px;
     height: 4px;
     width: 25px !important;
@@ -59,7 +60,7 @@
   }
 
   .t-tab-nav-wrap .t-tab-ink-bar {
-    margin-left: -28px;
+    margin-left: -31px;
   }
 
   .react-grid-item.cssTransforms {
@@ -987,6 +988,10 @@
     background:#713938;
   }
 
+  .list-RT-label .list-item {
+    margin: 10px 16px;
+  }
+
   .rightMore {
     position: absolute;
     right: 10px;
@@ -1041,5 +1046,6 @@
   .t-grid-item+.t-grid-item {
     border-left: none !important;
   }
+
 }
 

package/package.json

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