fmui-base 2.0.67 → 2.0.68

package/lib/react_grid/react_grid.js

@@ -308,7 +308,6 @@ var MyGrid = function (_React$Component) {
 
       _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,
@@ -638,10 +637,10 @@ 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' },
+            { className: 'react-grid-banner-img ' },
             _react2.default.createElement('img', { src: pathUrl })
           ),
           _react2.default.createElement(
@@ -680,7 +679,7 @@ var MyGrid = function (_React$Component) {
               var todoInfo = projectMenuUrl.todoInfo[item];
               return _react2.default.createElement(
                 'div',
-                { className: 'demo', 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' },
@@ -722,7 +721,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' },
@@ -844,14 +843,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' })
               );
@@ -1677,15 +1671,7 @@ 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) {

package/lib/react_grid/react_grid.less

@@ -16,7 +16,7 @@
     width: 3px;
     height: 65%;
     border-radius: 3px;
-    background-color: #E75E1E;
+    background-color: rgba(112, 59, 58,0.8);
     position: absolute;
     top: 4px;
     left: 8px;
@@ -85,22 +85,51 @@
     background-size: 100% 100%;
     // background-color: #fff;
   }
+
   .react-grid-component {
     background-color: #fff;
-    .react-grid-banner-img {
-      position: absolute;
-      width: 114%;
-      height: 130px;
-      left: -14%;
-      right: 0;
-      top: 0;
-      z-index: -1;
-     img {
-      width: 114%;
-      height: 100%;
-      border-radius: 0 0 50% 50%;
+
+    .react-grid-banner-type1 {
+      .react-grid-banner-img {
+        position: absolute;
+        width: 114%;
+        height: 130px;
+        left: -14%;
+        right: 0;
+        top: 0;
+        z-index: -1;
+       img {
+        width: 114%;
+        height: 100%;
+        border-radius: 0 0 50% 50%;
+        }
+      }
+
+      .global-search {
+        padding: 16px 16px 45px 16px;
       }
     }
+    
+    .react-grid-banner-type2 {
+      .react-grid-banner-img {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        right: 0;
+        top: 0;
+        z-index: -1;
+       img {
+        width: 100%;
+        height: 100%;
+        }
+      }
+
+      .global-search {
+        padding: 16px 16px 25px 16px;
+      }
+    }
+   
     .react-grid-banner {
       position: relative;
       color: #fff;
@@ -125,14 +154,12 @@
       .global-search {
         display: flex;
         align-items: center;
-        padding: 16px;
-        padding-bottom: 38px;
+       
     
         .t-filter-wrapper {
           height: 30px;
           padding: 5px 0;
           background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0.6) 100%);
-          border-radius: 4px 0 0 4px;
           background-image: linear-gradient(180deg, rgba(255,255,255,0.30) 0%, rgba(255,255,255,0.60) 100%);
           border: 1px solid rgba(255,255,255,1);
           border-radius: 4px;
@@ -202,7 +229,7 @@
         .t-text-field-content {
           background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.30) 0%, rgba(255, 255, 255, 0.60) 100%);
           height: 30px;
-          border-radius: 0 4px 4px 0;
+          border-radius:  4px;
           padding-left: 10px;
     
           .t-text-field-right-addon {
@@ -227,26 +254,33 @@
         }
       }
 
-      .t-grid-item:first-child, .t-grid-item:last-child {
+      .t-grid-item:first-child .react-grid-banner-type1, .t-grid-item:last-child .react-grid-banner-type1 {
         border-radius: 6px 6px 30px 30px;
       }
 
       .t-grid-item {
-        margin: 0  10px;
+        margin: 0  6px;
+      }
+
+      .t-badge {
+        width: 40px;
+        height: 40px;
+        margin-top: 5px;
+        border-radius: 50%;
+        line-height: 40px;
+      }
+
+      .menu-title {
+        margin-bottom: 10px;
+        margin-top: 5px;
+      }
+
+      .react-grid-banner-type1 {
+        width: 100%;
         background: #FFFFFF;
         background-image: linear-gradient(180deg, rgba(202,160,141,0.33) 0%, rgba(202,160,141,0.00) 40%);
         box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.09);
         border-radius: 6px;
-      }
-
-      .react-grid-banner-item {
-        .t-badge {
-          width: 40px;
-          height: 40px;
-          margin-top: 5px;
-          border-radius: 50%;
-          line-height: 40px;
-        }
 
         .banshicolor {
           background: #FE907220;
@@ -276,25 +310,28 @@
         i {
           font-size: 20px;
         }
+
+        .menu-title {
+          color: #121314;
+        }
       }
-    
-      .menu-title {
-        margin-bottom: 10px;
-        margin-top: 5px;
-        color: #121314;
-      }
-    
-      .t-badge .badge-inner {
-        line-height: 1.3;
-        height: auto;
-        font-weight: 400;
-        padding: 0 5px;
-        top: 9px;
-        right: -2px;
-        border: 2px solid #fff;
+
+      .react-grid-banner-type2 {
+        .t-badge {
+          background: #fff;
+          color: #703A3A;
+        }
+        .menu-title {
+          color: #fff;
+        }
       }
     }
-    
+  }
+
+  .t-badge .badge-inner {
+    font-weight: 400;
+    top: 3px;
+    border: 1px solid #fff;
   }
 
   .react-grid-component.banner {
@@ -303,42 +340,45 @@
     background-color: transparent;
   }
 
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+1) .systemItem .iconblock {
-    background: #FFBB3C;
+  .t-grid-row:nth-child(1) .t-grid-item:nth-child(1) .systemItem .iconblock {
+    background: #2D899D;
   }
 
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+2) .systemItem .iconblock {
-    background: #FE9072;
+  .t-grid-row:nth-child(1) .t-grid-item:nth-child(2) .systemItem .iconblock {
+    background: #944439;
   }
 
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+3) .systemItem .iconblock {
-    background: #3FACF6;
+  .t-grid-row:nth-child(1) .t-grid-item:nth-child(3) .systemItem .iconblock {
+    background: #228663;
   }
 
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+4) .systemItem .iconblock {
-    background: #1AC8D1;
+  .t-grid-row:nth-child(1) .t-grid-item:nth-child(4) .systemItem .iconblock {
+    background: #467989;
   }
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+5) .systemItem .iconblock {
-    background: #7C80DA;
+  .t-grid-row:nth-child(1) .t-grid-item:nth-child(5) .systemItem .iconblock {
+    background: #C39D5F;
   }
-  .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+6) .systemItem .iconblock {
-    background: #1AC8D1;
+  .t-grid-row:nth-child(2) .t-grid-item:nth-child(1) .systemItem .iconblock {
+    background: #228663;
   }
-
-  .t-grid-row:nth-child(n+2) .t-grid-item:nth-child(n+1) .systemItem .iconblock {
-    background: #7C80DA;
-  }
-  .t-grid-row:nth-child(n+2) .t-grid-item:nth-child(n+2) .systemItem .iconblock {
-    background: #3FACF6;
+  .t-grid-row:nth-child(2) .t-grid-item:nth-child(2) .systemItem .iconblock {
+    background: #467989;
   }
-  .t-grid-row:nth-child(n+2) .t-grid-item:nth-child(n+3) .systemItem .iconblock {
-    background: #FFBB3C;
+  .t-grid-row:nth-child(2) .t-grid-item:nth-child(3) .systemItem .iconblock {
+    background: #C39D5F;
   }
 
-  .t-grid-row:nth-child(n+2) .t-grid-item:nth-child(n+4) .systemItem .iconblock {
-    background: #FE9072;
+  .t-grid-row:nth-child(2) .t-grid-item:nth-child(4) .systemItem .iconblock {
+    background: #2D899D;
   }
 
+  .react-app-collect-type1 {
+    .systemItem {
+      .iconblock {
+        border-radius: 50%;
+      }
+    }
+  }
 
   .systemItem {
     display: inline-block;
@@ -357,7 +397,7 @@
     }
 
     .iconblock.t-gengduo {
-      background: #E3DBC7 !important;
+      background: #944439 !important;
     }
 
     // .iconblock.t-iconBCred {
@@ -398,12 +438,6 @@
     .t-badge {
       width: 100%;
     }
-
-    .t-badge .badge-inner {
-      line-height: 13px;
-      font-weight: 400;
-      border: 2px solid #fff;
-    }
   }
 
   .react-app-collect {
@@ -454,10 +488,15 @@
       padding: 10px;
       padding-right: 60px;
       position: relative;
-      height: 60px;
+      height: 55px;
 
       .title {
         font-size: 14px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 3;
+        -webkit-box-orient: vertical;
       }
 
       .describe {
@@ -467,7 +506,7 @@
 
       .iconfont-ywtb.ic {
         position: absolute;
-        right: 16px;
+        right: 11px;
         top: 0;
         line-height: 60px;
         font-size: 30px;
@@ -479,9 +518,9 @@
       .iconfont-ywtb.bg {
         position: absolute;
         right: 0;
-        top: -15px;
+        top: -11px;
         bottom: 0;
-        font-size: 60px;
+        font-size: 54px;
         opacity: 0.16;
         background-clip: text;
         -webkit-background-clip: text;
@@ -489,63 +528,64 @@
       }
     }
 
-    .banshi-item:nth-child(1) {
-      background: #FEF8E8;
+    .banshi-item:nth-child(6n+1) {
+      background: rgba(141, 42, 37,0.1);
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(to bottom, #FFA92B 20%, #FFD253 80%); // 背景线性渐变
-        color: #FFA92B; // 兜底颜色，防止文字裁剪不生效
+        // background-image: linear-gradient(to bottom, #FFA92B 20%, #FFD253 80%); // 背景线性渐变
+        background-image: linear-gradient(213deg, #8D2A25 0%, rgba(141,42,37,0.17) 100%);
+        color: rgba(141,42,37,0.17); // 兜底颜色，防止文字裁剪不生效
       }
     }
 
-    .banshi-item:nth-child(2) {
-      background: #FFF1F2;
+    .banshi-item:nth-child(6n+2) {
+      background: #46798910;
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(to bottom, #FF766D 20%, #FDAD78 80%); // 背景线性渐变
-        color: #FF766D; // 兜底颜色，防止文字裁剪不生效
+        background-image: linear-gradient(218deg, #467989 0%, rgba(70,121,137,0.12) 100%); // 背景线性渐变
+        color: rgba(70,121,137,0.12)  ; // 兜底颜色，防止文字裁剪不生效
       }
     }
 
-    .banshi-item:nth-child(3) {
-      background: #DFF0FF;
+    .banshi-item:nth-child(6n+3) {
+      background: #22866310;
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(106deg, #1990F0 20%, #73D2FF 80%); // 背景线性渐变
-        color: #1990F0; // 兜底颜色，防止文字裁剪不生效
+        background-image: linear-gradient(216deg, #228663 6%, rgba(34,134,99,0.15) 100%); // 背景线性渐变
+        color:  rgba(34,134,99,0.15); // 兜底颜色，防止文字裁剪不生效
       }
     }
 
-    .banshi-item:nth-child(4) {
-      background: #DEF8F7;
+    .banshi-item:nth-child(6n+4) {
+      background: #C39D5F10;
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(to bottom, #00C1CE 20%, #65DBD8 80%); // 背景线性渐变
-        color: #00C1CE; // 兜底颜色，防止文字裁剪不生效
+        background-image: linear-gradient(31deg, rgba(195,157,95,0.15) 0%, #C39D5F 93%); // 背景线性渐变
+        color: rgba(195,157,95,0.15); // 兜底颜色，防止文字裁剪不生效
       }
     }
 
-    .banshi-item:nth-child(5) {
-      background: #FEF5F3;
+    .banshi-item:nth-child(6n+5) {
+      background: #2D899D10;
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(to bottom, #FF7661 20%, #FBA772 80%); // 背景线性渐变
-        color: #FF7661; // 兜底颜色，防止文字裁剪不生效
+        background-image: linear-gradient(208deg, #2D899D 0%, rgba(45,137,157,0.15) 100%); // 背景线性渐变
+        color: rgba(45,137,157,0.15); // 兜底颜色，防止文字裁剪不生效
       }
     }
 
-    .banshi-item:nth-child(6) {
-      background: #EFF5FF;
+    .banshi-item:nth-child(6n+6) {
+      background: #05773310;
 
       .iconfont-ywtb.ic,
       .iconfont-ywtb.bg {
-        background-image: linear-gradient(to bottom, #686BC9 20%, #A2A8FA 80%); // 背景线性渐变
-        color: #686BC9; // 兜底颜色，防止文字裁剪不生效
+        background-image: linear-gradient(204deg, #037532 0%, rgba(4,123,53,0.15) 99%); // 背景线性渐变
+        color: rgba(4,123,53,0.15); // 兜底颜色，防止文字裁剪不生效
       }
     }
   }

package/package.json

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