fmui-base 2.0.47 → 2.0.49

package/README.md

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

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

@@ -1,21 +1,28 @@
+.react-grid .noTitle .t-tab-bar {
+  display: none;
+}
 .react-grid .t-tab-bar {
   padding-left: 6px;
 }
 .react-grid .t-tab-bar .t-tab-tab {
   font-size: 16px;
+  min-width: 95px;
   color: #888;
   flex: initial;
   padding: 0 10px;
-  min-width: 95px;
   height: 33px;
   line-height: 20px;
   display: block;
+  background-color: transparent;
+}
+.react-grid .t-tab-bar .t-tab-tab div {
+  min-width: 81px;
+  height: inherit;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   -webkit-line-clamp: 1;
   -webkit-box-orient: vertical;
-  background-color: transparent;
 }
 .react-grid .t-tab-bar .t-tab-tab-active {
   color: #333 !important;
@@ -44,12 +51,18 @@
 }
 .react-grid .react-grid-item.cssTransforms {
   overflow: auto;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
 }
 .react-grid .react-grid-component .react-grid-banner {
   color: #fff;
   width: 100%;
   height: 100%;
   padding: 0;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
 }
 .react-grid .react-grid-component .react-grid-banner .banner {
   position: absolute;
@@ -147,7 +160,7 @@
   box-shadow: none;
 }
 .react-grid .react-grid-component .react-grid-banner .t-grid {
-  margin: 8px;
+  margin: 0 8px;
   border: none;
 }
 .react-grid .react-grid-component .react-grid-banner .t-grid .t-grid-row {
@@ -185,8 +198,9 @@
 .react-grid .systemItem {
   display: inline-block;
   text-align: center;
+  width: fit-content;
   vertical-align: top;
-  padding-top: 25px;
+  padding-top: 16px;
 }
 .react-grid .systemItem .iconblock {
   width: 40px;
@@ -345,7 +359,6 @@
 }
 .react-grid .carousel-notice.t-slide .t-slide-item {
   padding: 16px;
-  background-image: url(/mobile/fmui/images/notice-card-bg.png);
   background-size: 100% 100%;
 }
 .react-grid .carousel-notice.t-slide .t-slide-item img {
@@ -370,13 +383,17 @@
   background-color: rgba(113, 57, 56, 0.1);
   color: #713938;
 }
-.react-grid .t-image-slide-item {
-  margin: 16px;
-  height: 100px !important;
+.react-grid .jxzt-content {
+  margin: 0 16px;
+}
+.react-grid .jxzt-content .t-image-slide-item {
   background-image: url(/mobile/fmui/images/notice-card-bg.png);
   background-size: 100% 100%;
   border-radius: 10px;
 }
+.react-grid .jxzt-content .t-slide-view {
+  height: 91px;
+}
 .react-grid .infoList {
   margin: 0 16px;
   padding: 10px 0;
@@ -487,7 +504,7 @@
   display: none;
 }
 .react-grid .calendar-container {
-  background: #fff;
+  background: transparent;
 }
 .react-grid .calendar-week {
   height: 20px;
@@ -500,12 +517,18 @@
   border-bottom: none;
   margin-bottom: 10px;
 }
-.react-grid .calendar-content .canChoose-active span {
+.react-grid .calendar-content .canChoose-active span,
+.react-grid .calendar-content div.today span {
   color: #713938 !important;
-  background: transparent !important;
+}
+.react-grid .calendar-content .canChoose-active span {
+  background: #F6F6F6 !important;
+}
+.react-grid .calendar-content div.today span {
+  background: #F6F6F6 !important;
 }
 .react-grid .calendar-content span.hasEvent:before {
-  color: #FAB88D;
+  color: #FAB88D !important;
 }
 .react-grid .rc-list .rc-item {
   padding: 5px 16px 5px 10px;
@@ -762,6 +785,9 @@
 .react-grid .list-RT-label .list-item .item-title::before {
   background: #713938;
 }
+.react-grid .list-RT-label .list-item {
+  margin-top: 16px;
+}
 .react-grid .rightMore {
   position: absolute;
   right: 10px;
@@ -770,21 +796,26 @@
   padding: 2px;
   font-size: 14px;
 }
+.react-grid .rightMore .iconfont-ywtb {
+  font-size: 7px;
+}
 .react-grid .sxbl_buttons {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 10px;
+  border-top: none !important;
+  padding: 0 16px;
 }
 .react-grid .sxbl_buttons button {
-  width: 45.4%;
+  width: 98%;
   height: 35px;
+  margin-bottom: 10px;
   background: rgba(112, 58, 58, 0.12);
   border: 2px solid #703a3a;
   border-radius: 4px;
   font-size: 16px;
   color: #703A3A;
 }
+.react-grid .sxbl_buttons .t-grid-row {
+  border-bottom: none !important;
+}
 .react-grid .wdsx-list .list-item {
   display: flex;
   align-items: center;

package/lib/db/db.js

@@ -885,10 +885,10 @@ context.create('reactGrid', {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
     willFetch: function willFetch() {
-      _Toast2.default.show({
-        content: _react2.default.createElement(_loading2.default, null),
-        duration: 800
-      });
+      // Toast.show({
+      //   content: <Loading />,
+      //   duration: 2000
+      // });
     }
   },
 
@@ -942,12 +942,7 @@ context.create('reactGrid', {
     header: {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
-    willFetch: function willFetch() {
-      _Toast2.default.show({
-        content: _react2.default.createElement(_loading2.default, null),
-        duration: 800
-      });
-    }
+    willFetch: function willFetch() {}
   },
   getComAppInfo: {
     url: _variables2.default.URLS.getComAppInfo,

package/lib/react_grid/react_grid.js

@@ -49,10 +49,6 @@ var _Toast = require('saltui/lib/Toast');
 
 var _Toast2 = _interopRequireDefault(_Toast);
 
-var _NoticeBar = require('saltui/lib/NoticeBar');
-
-var _NoticeBar2 = _interopRequireDefault(_NoticeBar);
-
 require('react-grid-layout/css/styles.css');
 
 require('react-resizable/css/styles.css');
@@ -108,6 +104,7 @@ var MyGrid = function (_React$Component) {
           res.map(function (item) {
             if (item.portletCode == 'banner') {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
+              _this.getRemindCount();
             } else if (item.portletCode == 'cyyy') {
               t.getShoucangAppInfo(item.id);
               t.getComAppInfo(item.id);
@@ -117,7 +114,6 @@ var MyGrid = function (_React$Component) {
                 ppId: item.id
               };
               _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
-                // console.log(res, '????????????????????????');
                 _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
               });
             }
@@ -125,12 +121,17 @@ var MyGrid = function (_React$Component) {
         } else {
           _Toast2.default.show({
             type: 'fail',
-            content: '未设置移动端首页',
-            autoHide: false
+            content: '未找到门户信息',
+            duration: 2000
           });
         }
+      }).catch(function (error) {
+        _Toast2.default.show({
+          type: 'fail',
+          content: error.errorMsg,
+          duration: 2000
+        });
       });
-      _this.getRemindCount();
     };
 
     _this.getShoucangAppInfo = function (id) {
@@ -180,14 +181,6 @@ var MyGrid = function (_React$Component) {
       });
     };
 
-    _this.toastNull = function () {
-      _Toast2.default.show({
-        type: 'fail',
-        content: '未设置移动端首页',
-        autoHide: false
-      });
-    };
-
     var portalId = props.portalId;
     var module = props.module;
     _this.state = {
@@ -631,7 +624,7 @@ var MyGrid = function (_React$Component) {
               { className: isShowList.indexOf('AI') > -1 ? 't-FAC' : 't-DN', onClick: function onClick() {
                   t.gotoYd();
                 } },
-              _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-sousuo1' }),
+              _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-zhineng' }),
               _react2.default.createElement(
                 'div',
                 { className: 't-FS12 t-MT4' },
@@ -716,10 +709,14 @@ 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: 'systemItem', 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, "homepage/home/applistSetting", personalSetting.cols * 1, item.id) },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -758,10 +755,14 @@ 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: 'systemItem', onClick: t.jumpPage.bind(this, "/appCollect") },
+                  { className: t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "/appCollect") },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -898,13 +899,14 @@ var MyGrid = function (_React$Component) {
         var carouselList = '';
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           var tDiv = document.createElement('div');
+          var ttxxImgUrl = "../../../fmui/images/ywtb/notice-card-bg.png";
           carouselItem = t.state[item.portletCode + '_' + item.id].map(function (item) {
             if (item.infoList.length > 0) {
               tDiv.innerHTML = item.infoList[0].content;
               var text = tDiv.innerText;
               return _react2.default.createElement(
                 _Carousel2.default.Item,
-                null,
+                { style: { backgroundImage: 'url(' + ttxxImgUrl + ')' } },
                 _react2.default.createElement(
                   'div',
                   { className: 'notice-card-head' },
@@ -1059,19 +1061,19 @@ var MyGrid = function (_React$Component) {
               _Tab2.default.Item,
               { title: _react2.default.createElement(
                   'div',
-                  { className: '', 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" : '' } },
+                  { 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" : '' } },
                   item.columnName
                 ), key: item.columnId },
               item.infoList.length > 0 ? _react2.default.createElement(
                 'div',
-                null,
+                { className: '' },
                 infoList,
                 _react2.default.createElement(
                   'div',
                   { className: 'info-more-btn', onClick: t.jumpPage.bind(this, "/channelDetail/" + item.channelId + '/' + item.columnId + '/' + item.columnName) },
                   '\u67E5\u770B\u66F4\u591A'
                 )
-              ) : _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+              ) : _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10 t-MT16', src: '../../../fmui/images/home/nodata.png' })
             );
           });
         }
@@ -1092,7 +1094,7 @@ var MyGrid = function (_React$Component) {
             gryjContent = t.state[item.portletCode + '_' + item.id].data.personList.map(function (item) {
               return _react2.default.createElement(
                 'div',
-                { className: 'list-item', onClick: t.skipPage.bind(this, 'mobile/modules/mail/dist/index.html?context=' + context + '&contextPath=flex&isPublic=0#/mail/details/' + item.mailId + '/1/0/undefined/undefined/undefined/1') },
+                { className: 'list-item ', onClick: t.skipPage.bind(this, 'mobile/modules/mail/dist/index.html?context=' + context + '&contextPath=flex&isPublic=0#/mail/details/' + item.mailId + '/1/0/undefined/undefined/undefined/1') },
                 _react2.default.createElement(
                   'div',
                   { className: item.isRead == "false" ? "item-label label-special" : "t-DN" },
@@ -1207,7 +1209,7 @@ var MyGrid = function (_React$Component) {
               ), key: '0' },
             _react2.default.createElement(
               'div',
-              { className: 'list-RT-label' },
+              { className: 'list-RT-label t-MT16' },
               gryjContent
             )
           );
@@ -1222,7 +1224,7 @@ var MyGrid = function (_React$Component) {
               ), key: '1' },
             _react2.default.createElement(
               'div',
-              { className: 'list-RT-label' },
+              { className: 'list-RT-label t-MT16' },
               ggyjContent
             )
           );
@@ -1499,7 +1501,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

@@ -39,7 +39,7 @@
 
   .t-tab-ink-bar {
     // background-color: @theme-color  !important;
-    margin-left: -33px;
+    margin-left: -36px;
     border-radius: 4px;
     height: 4px;
     width: 25px !important;
@@ -250,7 +250,7 @@
     text-align: center;
     width: fit-content;
     vertical-align: top;
-    padding-top: 25px;
+    padding-top: 16px;
 
     .iconblock {
       width: 40px;
@@ -334,7 +334,7 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    padding: 16px;
+    padding: 10px 16px 16px 16px;
     padding-bottom: 0;
 
     .banshi-item {
@@ -447,10 +447,15 @@
     border-radius: 5px;
 
     .t-slide-item {
-      padding: 16px;
+      // padding: 16px;
       // background-color: @theme-color-4;
-      background-image: url(/mobile/fmui/images/notice-card-bg.png);
+      // background-image: url(../../../fmui/images/ywtb/notice-card-bg.png);
+      background-size: 100% 100%;
+    }
+
+    .t-slide-item-inner  {
       background-size: 100% 100%;
+      background-repeat: no-repeat;
     }
 
     .t-slide-item img {
@@ -1031,6 +1036,10 @@
       justify-content: initial;
     }
   }
- 
+
+
+  .t-grid-item+.t-grid-item {
+    border-left: none !important;
+  }
 }
 

package/package.json

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