fmui-base 2.0.37 → 2.0.39

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.39：表单级联计算修改
+- 2.0.38：移动门户组件修改
 - 2.0.37：精选专题跳转
 - 2.0.36：移动门户组件修改
 - 2.0.35：移动门户组件修改

package/lib/form/table.js

@@ -1170,6 +1170,7 @@ var PageHome = function (_React$Component) {
 						}
 						if (returnResultItem && returnResultItem.length > 0) {
 							for (var r = 0; r < returnResultItem.length; r++) {
+								this.forCalculateExpList(data, itemParam, returnResultItem[r]);
 								this.forSubCalculateExpList(data, itemParam, returnResultItem[r]);
 							}
 						}

package/lib/process_batch/processBatch.js

@@ -149,7 +149,7 @@ var PageHome = function (_React$Component) {
             savePhraseList: savePhraseList, //是否保存为常用语的选项列表
             savePhrase: [], //是否保存为常用语，1是，0否
             level: '',
-            shortMessageList: [{ value: "2", checked: false, content: '移动端提醒', disable: false }]
+            shortMessageList: [{ value: "2", checked: true, content: '移动端提醒', disable: false }]
         };
 
         // FlowCommon = require('pages/flow_common/'+module).default?require('pages/flow_common/'+module).default:require('pages/flow_common/'+module);

package/lib/react_grid/react_grid.js

@@ -109,9 +109,7 @@ var MyGrid = function (_React$Component) {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
             });
           } else if (item.portletCode == 'banner') {
-            _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)), function () {
-              console.log(_this.state, '///////////////////////////');
-            });
+            _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
           }
         });
       });
@@ -406,6 +404,36 @@ var MyGrid = function (_React$Component) {
       location.hash = "topicservice/" + code;
     }
 
+    //跳转更多
+
+  }, {
+    key: 'skip2More',
+    value: function skip2More(type) {
+      var url = "";
+      if (type == 'grhy') {
+        //会议
+        url = getLoginUserInfo().context + '/mobile/modules/meeting/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1';
+        pageSkipDirectly(url);
+      } else if (type == 'gryj') {
+        //个人邮件
+        url = getLoginUserInfo().context + '/mobile/modules/mail/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1&isPublic=0#/mail/home/1/';
+        pageSkipDirectly(url);
+      } else if (type == 'ggyj') {
+        //公共邮件
+        url = getLoginUserInfo().context + '/mobile/modules/mail/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1&isPublic=1#/mail/home/1/';
+        pageSkipDirectly(url);
+      } else if (type == 'lcfq') {
+        //流程发起
+        location.hash = "officehall";
+      } else if (type == 'wdsx') {
+        //我的事项
+        location.hash = "approval/all/5";
+      } else if (type == 'bssx') {
+        //办事事项
+        location.hash = "officehall";
+      }
+    }
+
     //跳转到我的事项
 
   }, {
@@ -476,7 +504,7 @@ var MyGrid = function (_React$Component) {
       var componentHead = '';
       if (item.portletCode === 'banner') {
         // 判断AI和menu
-        var isShowList = JSON.parse(item.personalSetting).bannerSet.split(',');
+        var isShowList = JSON.parse(item.personalSetting).bannerSet;
         var _styleSetting = JSON.parse(item.styleSetting);
         var pathUrl = "";
         var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
@@ -603,7 +631,7 @@ var MyGrid = function (_React$Component) {
                 }) : '',
                 _react2.default.createElement(
                   'div',
-                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting") },
+                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols) },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -753,7 +781,7 @@ var MyGrid = function (_React$Component) {
           { className: 'component-bssx' },
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
+            { className: 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' })
           ),
@@ -1088,10 +1116,20 @@ var MyGrid = function (_React$Component) {
           );
         }
         componentContent = _react2.default.createElement(
-          _Tab2.default,
-          { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
-          personMailTab,
-          publicMailTab
+          'div',
+          null,
+          _react2.default.createElement(
+            'p',
+            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
+            '\u66F4\u591A',
+            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
+          ),
+          _react2.default.createElement(
+            _Tab2.default,
+            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
+            personMailTab,
+            publicMailTab
+          )
         );
       }
       if (item.portletCode === 'grrc') {
@@ -1166,9 +1204,11 @@ var MyGrid = function (_React$Component) {
           calendarDom,
           grrcList
         );
-        setTimeout(function () {
-          t.initCleader(t.state[item.portletCode + '_' + item.id], item.id);
-        }, 600);
+        if (t.state[item.portletCode + '_' + item.id]) {
+          setTimeout(function () {
+            t.initCleader(t.state[item.portletCode + '_' + item.id], item.id);
+          }, 600);
+        }
       }
       if (item.portletCode === 'grhy') {
         var grhyContent = '';
@@ -1446,15 +1486,15 @@ var MyGrid = function (_React$Component) {
       return _react2.default.createElement(
         'div',
         { className: 'react-grid-component', key: item.id, style: {
-            borderTopLeftRadius: styleSetting.otherSet.radius.topLeft,
-            borderTopRightRadius: styleSetting.otherSet.radius.topRight,
-            borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft,
-            borderBottomRightRadius: styleSetting.otherSet.radius.bottomRight,
-            paddingLeft: styleSetting.pl,
-            paddingright: styleSetting.pr,
-            paddingTop: styleSetting.pt,
-            paddingBottom: styleSetting.pb,
-            background: styleSetting.bgColor ? styleSetting.bgColor : ''
+            borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
+            borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
+            borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',
+            borderBottomRightRadius: styleSetting.otherSet.radius.bottomRight + 'px',
+            paddingLeft: styleSetting.otherSet.paddingSet.pl + 'px',
+            paddingright: styleSetting.otherSet.paddingSet.pr + 'px',
+            paddingTop: styleSetting.otherSet.paddingSet.pt + 'px',
+            paddingBottom: styleSetting.otherSet.paddingSet.pb + 'px',
+            backgroundColor: styleSetting.otherSet.bgColor
           } },
         styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
         componentContent
@@ -1537,9 +1577,7 @@ var MyGrid = function (_React$Component) {
             margin: [0, 10]
           },
           this.state.data.map(function (item) {
-            console.log('====================================');
-            console.log(t.portalContent(item), ' t.portalContent(item) t.portalContent(item)');
-            console.log('====================================');
+
             return t.portalContent(item) || null;
 
             // 添加一个默认返回值，以避免未指定键的错误

package/lib/react_grid/react_grid.less

@@ -467,9 +467,9 @@
   }
 
   .jxzt-content {
+    margin: 16px;
     .t-image-slide-item {
-      margin: 16px;
-      height: 91px !important;
+      // height: 91px !important;
       background-image: url(/mobile/fmui/images/notice-card-bg.png);
       background-size: 100% 100%;
       border-radius: 10px;
@@ -635,14 +635,19 @@
     margin-bottom: 10px;
   }
 
-  .calendar-content .canChoose-active span {
+  .calendar-content .canChoose-active span ,.calendar-content div.today span{
     color:#713938 !important;
-    // background: #F6F6F6 !important;
+  }
+  .calendar-content .canChoose-active span  {
+    background: #F6F6F6 !important;
+  }
+
+  .calendar-content div.today span {
     background: transparent !important;
   }
 
   .calendar-content span.hasEvent:before {
-    color: #FAB88D;
+    color: #FAB88D !important;
   }
 
   .rc-list {
@@ -968,6 +973,10 @@
     z-index: 999;
     padding: 2px;
     font-size: 14px;
+
+    .iconfont-ywtb {
+      font-size: 7px;
+    }
   }
 
   .sxbl_buttons {

package/package.json

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