fmui-base 2.2.50 → 2.2.52

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.52: 时间字段宏值赋值不生效
+- 2.2.51: 北京CA跳转小程序
 - 2.2.50: 上传组件查看图片功能适配桌端
 - 2.2.49: 表单组件支持回显已删除的用户
 - 2.2.48: 选人组件支持回显已删除的用户

package/lib/form/form.js

@@ -919,6 +919,10 @@ var PageHome = function (_React$Component) {
         }
       } else if (itemType == 'datetime') {
         //时间
+        if (fuzhiFields && fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
+          value = form.defaultValue;
+        }
+
         if (value) {
           if (value.length == 10) {
             isVerifySingValue = value + " 00:00:00";
@@ -1122,10 +1126,13 @@ var PageHome = function (_React$Component) {
         var uploadFileNumLimit = "";
         var uploadFileLimit = "";
         var canDownload = "";
+        var imagetype = ""; // 0 图片上传 1 手写签名
+
         if (formDataAttr) {
           uploadFileNumLimit = formDataAttr.uploadFileNumLimit; //上传个数限制
           uploadFileLimit = formDataAttr.uploadFileLimit; //上传类型限制
           canDownload = formDataAttr.canDownload; //是否下载
+          imagetype = formDataAttr.imagetype; // 0 图片上传 1 手写签名
         }
         if (value) {
           value = value.replace(/\|/g, ",");

package/lib/process_info/processInfo.js

@@ -475,7 +475,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -1217,9 +1217,14 @@ var PageHome = function (_React$Component) {
                     //是否是产品CA 1是  0否
                     var caIsPrd = "";
                     var oauthWindowURL = "";
+                    var signDataId = "";
+                    if (content.signDataId && content.signDataId != null && content.signDataId != 'null' && typeof content.signDataId != 'undefined' && content.signDataId != '') {
+                        signDataId = content.signDataId;
+                    }
+
                     if (content.oauthWindowURL && content.oauthWindowURL != null && content.oauthWindowURL != 'null' && typeof content.oauthWindowURL != 'undefined' && content.oauthWindowURL != '') {
                         oauthWindowURL = content.oauthWindowURL;
-                        t.openCaPage(oauthWindowURL, content.caFirm);
+                        t.openCaPage(oauthWindowURL, content.caFirm, signDataId);
                     }
                     var isCaUser = "0";
                     if (content.isCaUser && content.isCaUser != null && content.isCaUser != 'null' && typeof content.isCaUser != 'undefined' && content.isCaUser != '') {
@@ -1476,6 +1481,7 @@ var PageHome = function (_React$Component) {
                         urgentSelectList: urgentSelectList,
                         backInitiatorEndFlow: backInitiatorEndFlow,
                         oauthWindowURL: oauthWindowURL,
+                        signDataId: signDataId,
                         isCaUser: isCaUser,
                         caFirm: caFirm,
                         addlotsReturn: addlotsReturn
@@ -7630,12 +7636,13 @@ var PageHome = function (_React$Component) {
 
     }, {
         key: 'openCaPage',
-        value: function openCaPage(oauthWindowURL, caFirm) {
+        value: function openCaPage(oauthWindowURL, caFirm, signDataId) {
             setTimeout(function () {
                 console.log('oauthWindowURL', oauthWindowURL);
                 if (oauthWindowURL && oauthWindowURL != null && oauthWindowURL != 'null' && typeof oauthWindowURL != 'undefined' && oauthWindowURL != '' && caFirm && caFirm != null && caFirm != 'null' && typeof caFirm != 'undefined' && caFirm != '') {
                     localStorage.setItem('oauthWindowURL', oauthWindowURL);
                     localStorage.setItem('caFirm', caFirm);
+                    localStorage.setItem('signDataId', signDataId);
                     // console.log(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
                     // window.open(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
                     location.href = getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html';

package/package.json

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