fmui-base 2.2.4 → 2.2.6

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.6：一网通办首页去掉遮罩层，流程列表组件样式调整
+- 2.2.5：移动端支持深圳CA授权
 - 2.2.4：统一待办样式
 - 2.2.3：流程表单样式
 - 2.2.2：表单多行文本支持浮点型判断

package/lib/db/db.js

@@ -1146,7 +1146,7 @@ context.create('reactGrid', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }
@@ -1162,7 +1162,7 @@ context.create('reactGrid', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }
@@ -1177,7 +1177,7 @@ context.create('reactGrid', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }
@@ -1192,7 +1192,7 @@ context.create('reactGrid', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }
@@ -1216,7 +1216,7 @@ context.create('reactGrid', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }
@@ -1233,7 +1233,7 @@ context.create('portal', {
     willFetch: function willFetch() {
       _Toast2.default.show({
         content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
+        hasMask: false,
         duration: 800
       });
     }

package/lib/form/form.js

@@ -1528,6 +1528,7 @@ var PageHome = function (_React$Component) {
         //     itemParam: itemParam
         //   });
         // },1000)
+        console.log("param===" + JSON.stringify(param));
         _db2.default.FlowApproval.verifySign(param).then(function (content) {
           var result = content.verifySignRes;
           if (result == 'success') {

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/lib/process_list/processList.js

@@ -1284,7 +1284,7 @@ var PageHome = function (_React$Component2) {
             { title: undoDiv },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-BCf' },
+              { vAlign: 'center', className: 't-BCf t-MT10' },
               _react2.default.createElement(
                 Box,
                 { flex: 1 },
@@ -1334,7 +1334,7 @@ var PageHome = function (_React$Component2) {
             { title: unreadDiv },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-BCf' },
+              { vAlign: 'center', className: 't-BCf t-MT10' },
               _react2.default.createElement(
                 Box,
                 { flex: 1 },
@@ -1384,7 +1384,7 @@ var PageHome = function (_React$Component2) {
             { title: "已办" + (this.state.titleCount.done == 0 ? '' : '(' + this.state.titleCount.done + ')') },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-BCf' },
+              { vAlign: 'center', className: 't-BCf t-MT10' },
               _react2.default.createElement(
                 Box,
                 { flex: 1 },
@@ -1429,7 +1429,7 @@ var PageHome = function (_React$Component2) {
             { title: "已阅" + (this.state.titleCount.read == 0 ? '' : '(' + this.state.titleCount.read + ')') },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-BCf' },
+              { vAlign: 'center', className: 't-BCf t-MT10' },
               _react2.default.createElement(
                 Box,
                 { flex: 1 },
@@ -1474,7 +1474,7 @@ var PageHome = function (_React$Component2) {
             { title: "我的" + (this.state.titleCount.myself == 0 ? '' : '(' + this.state.titleCount.myself + ')') },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-BCf' },
+              { vAlign: 'center', className: 't-BCf t-MT10' },
               _react2.default.createElement(
                 Box,
                 { flex: 1 },

package/package.json

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