fmui-base 2.0.42 → 2.0.44

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.44：移动门户组件修改
+- 2.0.43：移动门户组件修改
 - 2.0.42：移动门户组件修改
 - 2.0.41：表单文本字段级联计算修改
 - 2.0.40：移动门户组件修改

package/lib/css/react_grid.css

@@ -1,21 +1,27 @@
+.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 {
+  max-width: 81px;
   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 +50,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;
@@ -492,7 +504,7 @@
   display: none;
 }
 .react-grid .calendar-container {
-  background: #fff;
+  background: transparent;
 }
 .react-grid .calendar-week {
   height: 20px;
@@ -513,7 +525,7 @@
   background: #F6F6F6 !important;
 }
 .react-grid .calendar-content div.today span {
-  background: transparent !important;
+  background: #F6F6F6 !important;
 }
 .react-grid .calendar-content span.hasEvent:before {
   color: #FAB88D !important;
@@ -781,21 +793,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/variables.js

@@ -201,5 +201,6 @@ exports.default = {
         richeng: '#/', //日程
         dwxx: '#/' //单位信息
 
-    }
+    },
+    ydPath: context + '/mobile/modules/yd/yd.html'
 };

package/lib/form/table.js

@@ -1032,6 +1032,7 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'forSubCalculateExpList',
 		value: function forSubCalculateExpList(data, itemParam, uniqueName) {
+			var that = this;
 			var calculateExpList = data.subCalculateExpList;
 			if (calculateExpList) {
 				var calculateExpValue = calculateExpList[uniqueName];
@@ -1151,10 +1152,10 @@ var PageHome = function (_React$Component) {
 											res = Number(res).toFixed(decimalPlace) + '';
 										} else {
 											if (fieldArray.length == 0) {
-												var aDP = getActualDecimalPlace(exp);
+												var aDP = that.getActualDecimalPlace(exp);
 												res = res.toFixed(aDP) + '';
 											} else {
-												var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
+												var maxDP = that.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
 												res = res.toFixed(maxDP) + '';
 											}
 										}

package/lib/react_grid/react_grid.js

@@ -45,6 +45,14 @@ var _Button = require('saltui/lib/Button');
 
 var _Button2 = _interopRequireDefault(_Button);
 
+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');
@@ -93,44 +101,42 @@ var MyGrid = function (_React$Component) {
       var t = _this;
       // 部件的初始化信息
       _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
-        // console.log('====================================');
-        // console.log(res, 'resresresresres');
-        // console.log('====================================');
-
-        _this.setState({
-          data: res
-        });
-        res.map(function (item) {
-          if (item.portletCode == 'banner') {
-            _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
-          } else if (item.portletCode == 'cyyy') {
-            console.log('====================================');
-            console.log(item.id, '//////////////////////////');
-            console.log('====================================');
-            t.getShoucangAppInfo(item.id);
-            t.getComAppInfo(item.id);
-          } else if (item.portletCode !== 'tbgl') {
-            var params = {
-              code: item.portletCode,
-              ppId: item.id
-            };
-            _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
-              // console.log(res, '????????????????????????');
-              _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
-            });
-          }
-        });
+        if (res && res.length > 0) {
+          _this.setState({
+            data: res
+          });
+          res.map(function (item) {
+            if (item.portletCode == 'banner') {
+              _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
+            } else if (item.portletCode == 'cyyy') {
+              t.getShoucangAppInfo(item.id);
+              t.getComAppInfo(item.id);
+            } else if (item.portletCode !== 'tbgl') {
+              var params = {
+                code: item.portletCode,
+                ppId: item.id
+              };
+              _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
+                // console.log(res, '????????????????????????');
+                _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
+              });
+            }
+          });
+        } else {
+          _Toast2.default.show({
+            type: 'fail',
+            content: '未设置移动端首页',
+            autoHide: false
+          });
+        }
       });
       _this.getRemindCount();
     };
 
     _this.getShoucangAppInfo = function (id) {
-      console.log('====================================');
-      console.log(id, 'ididididididididiididiididiididididi');
-      console.log('====================================');
       _db2.default.reactGrid.getNewHomePageCollectAppInfoList({ showClient: "DING" }).then(function (result) {
         _this.setState(_defineProperty({}, 'wdsc' + '_' + id, result.data), function () {
-          console.log(_this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
+          // console.log(this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
         });
       }).catch(function (error) {});
     };
@@ -174,6 +180,14 @@ 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 = {
@@ -246,8 +260,8 @@ var MyGrid = function (_React$Component) {
       bssxPer_show: true, //办事事项_个人_是否显示
       bssxOrg_show: true, //办事事项_个人_是否显示,
       cyyyUsuTab_show: true, //常用应用_是否显示
-      cyyyPerTab_show: true //我的收藏_是否显示
-
+      cyyyPerTab_show: true, //我的收藏_是否显示
+      activeIndex_mail: 0
 
     };
     return _this;
@@ -371,7 +385,7 @@ var MyGrid = function (_React$Component) {
   }, {
     key: 'gotoYd',
     value: function gotoYd() {
-      pageSkipDirectly(variables.ydPath);
+      pageSkipDirectly(_variables2.default.ydPath);
     }
 
     // 应用跳转
@@ -547,13 +561,37 @@ var MyGrid = function (_React$Component) {
         }
       }
     }
+  }, {
+    key: 'handleChange',
+    value: function handleChange(id, obj) {
+
+      var t = this;
+      console.log({
+        activeIndex: obj.active,
+        preActiveIndex: obj.preActive,
+        data: id
+      });
+      if (obj.active == '1') {
+        var _setState3;
+
+        this.setState((_setState3 = {}, _defineProperty(_setState3, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState3, 'activeIndex_gryj_' + id, false), _setState3));
+      } else {
+        var _setState4;
+
+        this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
+      }
+    }
   }, {
     key: 'portalContent',
     value: function portalContent(item) {
       var t = this;
       var styleSetting = JSON.parse(item.styleSetting);
       var personalSetting = JSON.parse(item.personalSetting);
-      var componentContent = '';
+      var componentContent = _react2.default.createElement(
+        'div',
+        null,
+        _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+      );
       var componentHead = '';
       if (item.portletCode === 'banner') {
         // 判断AI和menu
@@ -562,7 +600,6 @@ var MyGrid = function (_React$Component) {
         var pathUrl = "";
         var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg) {
-          debugger;
           var pathUrlId = t.state[item.portletCode + '_' + item.id].bannerImg;
           pathUrl = localStorage.getItem('context') + '/api/m/plugin/attachment/mobile/viewImage?token=' + localStorage.getItem('token') + '&fid=' + pathUrlId;
         } else {
@@ -745,7 +782,7 @@ var MyGrid = function (_React$Component) {
 
         var perList = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].perList) {
+          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) {
               return _react2.default.createElement(
                 'div',
@@ -766,11 +803,17 @@ var MyGrid = function (_React$Component) {
                 _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' ic' })
               );
             });
+          } else {
+            perList = _react2.default.createElement(
+              'div',
+              null,
+              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+            );
           }
         }
         var orgList = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].orgList) {
+          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) {
               return _react2.default.createElement(
                 'div',
@@ -791,6 +834,12 @@ var MyGrid = function (_React$Component) {
                 _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' ic' })
               );
             });
+          } else {
+            orgList = _react2.default.createElement(
+              'div',
+              null,
+              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+            );
           }
         }
         var bssxPerTab = '';
@@ -830,7 +879,7 @@ var MyGrid = function (_React$Component) {
           { className: 'component-bssx' },
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
+            { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
             '\u66F4\u591A',
             _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
           ),
@@ -908,11 +957,13 @@ var MyGrid = function (_React$Component) {
               )
             )
           );
+        } else {
+          componentContent = '';
         }
       }
       if (item.portletCode === 'xwzx') {
         var xwzxContent = '';
-        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length) {
+        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           xwzxContent = t.state[item.portletCode + '_' + item.id].map(function (item) {
             var infoList = item.infoList.map(function (infoItem) {
               var imgSrc = "";
@@ -1023,9 +1074,11 @@ var MyGrid = function (_React$Component) {
               ) : _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
             );
           });
+        } else {
+          componentContent = '';
         }
 
-        if (t.state[item.portletCode + '_' + item.id]) {
+        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           componentContent = _react2.default.createElement(
             _Tab2.default,
             { activeKey: t.state[item.portletCode + '_' + item.id][0].columnId, pageSize: 4, showExpandAll: false, speed: 2 },
@@ -1034,10 +1087,11 @@ var MyGrid = function (_React$Component) {
         }
       }
       if (item.portletCode === 'gryj') {
+
         var gryjShowList = personalSetting.mailMenu;
         var gryjContent = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].data.personList) {
+          if (t.state[item.portletCode + '_' + item.id].data.personList && t.state[item.portletCode + '_' + item.id].data.personList.length > 0) {
             gryjContent = t.state[item.portletCode + '_' + item.id].data.personList.map(function (item) {
               return _react2.default.createElement(
                 'div',
@@ -1082,11 +1136,17 @@ var MyGrid = function (_React$Component) {
                 )
               );
             });
+          } else {
+            gryjContent = _react2.default.createElement(
+              'div',
+              null,
+              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+            );
           }
         }
         var ggyjContent = '';
         if (t.state[item.portletCode + '_' + item.id]) {
-          if (t.state[item.portletCode + '_' + item.id].data.publicList) {
+          if (t.state[item.portletCode + '_' + item.id].data.publicList && t.state[item.portletCode + '_' + item.id].data.publicList.length > 0) {
             ggyjContent = t.state[item.portletCode + '_' + item.id].data.publicList.map(function (item) {
               return _react2.default.createElement(
                 'div',
@@ -1131,6 +1191,12 @@ var MyGrid = function (_React$Component) {
                 )
               );
             });
+          } else {
+            ggyjContent = _react2.default.createElement(
+              'div',
+              null,
+              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+            );
           }
         }
         var personMailTab = '';
@@ -1167,15 +1233,20 @@ var MyGrid = function (_React$Component) {
         componentContent = _react2.default.createElement(
           'div',
           null,
-          _react2.default.createElement(
+          t.state['activeIndex_ggyj_' + item.id] && t.state['activeIndex_ggyj_' + item.id] === true ? _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
+            { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
+            '\u66F4\u591A',
+            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
+          ) : _react2.default.createElement(
+            'p',
+            { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'gryj') },
             '\u66F4\u591A',
             _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
           ),
           _react2.default.createElement(
             _Tab2.default,
-            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
+            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1", onChange: t.handleChange.bind(this, item.id) },
             personMailTab,
             publicMailTab
           )
@@ -1359,7 +1430,7 @@ var MyGrid = function (_React$Component) {
           { className: 'component-bssx' },
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
+            { 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' })
           ),
@@ -1386,7 +1457,7 @@ var MyGrid = function (_React$Component) {
           null,
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
+            { 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' })
           ),
@@ -1440,7 +1511,7 @@ var MyGrid = function (_React$Component) {
           null,
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
+            { 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' })
           ),
@@ -1508,7 +1579,7 @@ var MyGrid = function (_React$Component) {
           null,
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
+            { 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' })
           ),
@@ -1522,7 +1593,7 @@ var MyGrid = function (_React$Component) {
               ), key: '0' })
           )
         );
-        componentContent = '';
+
         var _carouselItem = '';
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
 
@@ -1585,72 +1656,31 @@ var MyGrid = function (_React$Component) {
         };
       });
 
-      var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
-      // 控制【常用应用】显示列数
-      var colNum1 = 4;
-
-      var grrcContent = t.state.grrc_list.map(function (item) {
-        var completed = false;
-        if (item.startTime) {
-          var date = new Date(item.startTime.replace(/-/g, '/'));
-          var H = date.getHours();
-          var M = date.getMinutes();
-          if (H < 10) {
-            H = "0" + H;
-          }
-          if (M < 10) {
-            M = "0" + M;
-          }
-          var time = H + ":" + M;
-          var now = new Date();
-          if (date < now) {
-            //过去时
-            completed = true;
-          }
-        }
+      if (!layout || layout.length === 0) {
+        return null;
+      } else {
         return _react2.default.createElement(
-          HBox,
-          { className: completed ? 'rc-item t-PR rc-completed' : 'rc-item t-PR', vAlign: 'center' },
-          _react2.default.createElement(
-            Box,
-            { className: 'rc-item-time' },
-            time
-          ),
-          _react2.default.createElement(
-            Box,
-            { className: 'rc-item-time-line' },
-            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-fuhao' })
-          ),
+          'div',
+          { className: 'react-grid' },
           _react2.default.createElement(
-            Box,
-            { flex: 1, className: 'rc-item-title t-omit' },
-            item.title
+            _reactGridLayout2.default,
+            {
+              className: 'layout',
+              layout: layout,
+              cols: 12,
+              rowHeight: 20,
+              width: window.innerWidth,
+              isDraggable: this.state.isDraggable,
+              margin: [0, 5]
+            },
+            this.state.data.map(function (item) {
+              return t.portalContent(item) || null;
+
+              // 添加一个默认返回值，以避免未指定键的错误
+            })
           )
         );
-      });
-
-      return _react2.default.createElement(
-        'div',
-        { className: 'react-grid' },
-        _react2.default.createElement(
-          _reactGridLayout2.default,
-          {
-            className: 'layout',
-            layout: layout,
-            cols: 12,
-            rowHeight: 20,
-            width: window.innerWidth,
-            isDraggable: this.state.isDraggable,
-            margin: [0, 5]
-          },
-          this.state.data.map(function (item) {
-
-            return t.portalContent(item) || null;
-
-            // 添加一个默认返回值，以避免未指定键的错误
-          })
-        )
-      );
+      }
     }
   }]);
 

package/lib/react_grid/react_grid.less

@@ -22,7 +22,7 @@
     background-color: transparent;
 
     div {
-      max-width: 95px;
+      max-width: 81px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -65,6 +65,9 @@
     // width: 100% !important;
     // margin: 0 10px;
     overflow: auto;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
     // background-color: #fff;
   }
 
@@ -655,7 +658,7 @@
   }
 
   .calendar-content div.today span {
-    background: transparent !important;
+    background: #F6F6F6 !important;
   }
 
   .calendar-content span.hasEvent:before {

package/package.json

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