fmui-base 2.2.3 → 2.2.5

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.5：移动端支持深圳CA授权
+- 2.2.4：统一待办样式
 - 2.2.3：流程表单样式
 - 2.2.2：表单多行文本支持浮点型判断
 - 2.2.1：表单关联增加行隐藏参数

package/lib/msg_list/msgList.js

@@ -1070,28 +1070,27 @@ var PageHome = function (_React$Component2) {
           props.id + ' ' + props.name
         );
       };
+      // let undoDiv = <div> 待办{this.state.titleCount.undo == 0 ? '' : <span style={{ color: 'red' }}>({this.state.titleCount.undo})</span>}</div>;
+      // let unreadDiv = <div> 待阅{this.state.titleCount.unread == 0 ? '' : <span style={{ color: 'red' }}>({this.state.titleCount.unread})</span>}</div>;
+
       var undoDiv = _react2.default.createElement(
         'div',
-        null,
+        { className: 't-badge' },
         ' \u5F85\u529E',
         this.state.titleCount.undo == 0 ? '' : _react2.default.createElement(
           'span',
-          { style: { color: 'red' } },
-          '(',
-          this.state.titleCount.undo,
-          ')'
+          { className: 'badge-inner' },
+          this.state.titleCount.undo
         )
       );
       var unreadDiv = _react2.default.createElement(
         'div',
-        null,
+        { className: 't-badge' },
         ' \u5F85\u9605',
         this.state.titleCount.unread == 0 ? '' : _react2.default.createElement(
           'span',
-          { style: { color: 'red' } },
-          '(',
-          this.state.titleCount.unread,
-          ')'
+          { className: 'badge-inner' },
+          this.state.titleCount.unread
         )
       );
       return _react2.default.createElement(

package/lib/process_info/processInfo.js

@@ -462,7 +462,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -1188,6 +1188,11 @@ var PageHome = function (_React$Component) {
                     var commentCasign = "0";
                     //是否是产品CA 1是  0否
                     var caIsPrd = "";
+                    var oauthWindowURL = "";
+                    if (content.oauthWindowURL && content.oauthWindowURL != null && content.oauthWindowURL != 'null' && typeof content.oauthWindowURL != 'undefined' && content.oauthWindowURL != '') {
+                        oauthWindowURL = content.oauthWindowURL;
+                        t.openCaPage(oauthWindowURL);
+                    }
                     var commentBackAlert = [];
                     if (content.commentCasign == '1') {
                         commentCasign = '1';
@@ -1422,7 +1427,8 @@ var PageHome = function (_React$Component) {
                         subProcessType: subProcessType,
                         urgencyList: urgencyList,
                         urgentSelectList: urgentSelectList,
-                        backInitiatorEndFlow: backInitiatorEndFlow
+                        backInitiatorEndFlow: backInitiatorEndFlow,
+                        oauthWindowURL: oauthWindowURL
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -7387,6 +7393,21 @@ var PageHome = function (_React$Component) {
                 }
             });
         }
+
+        //打开深圳CA授权页面
+
+    }, {
+        key: 'openCaPage',
+        value: function openCaPage(oauthWindowURL) {
+            setTimeout(function () {
+                console.log('oauthWindowURL', oauthWindowURL);
+                if (oauthWindowURL && oauthWindowURL != null && oauthWindowURL != 'null' && typeof oauthWindowURL != 'undefined' && oauthWindowURL != '') {
+                    localStorage.setItem('oauthWindowURL', oauthWindowURL);
+                    console.log(getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html');
+                    window.open(getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html');
+                }
+            }, 100);
+        }
     }, {
         key: 'render',
         value: function render() {

package/package.json

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