fmui-base 2.3.29 → 2.3.31

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.31：移动端推送点开的流程表单切换组织不显示，集成新疆CA
+- 2.3.30：移动端日期型字段日期格式（xx年xx月xx日）移动端办理后丢失
 - 2.3.29：移动端办理宏值签名丢失
 - 2.3.28：传阅支持群发控制，支持禁选组织、职务、群组，管理员跳转选泽的用户用户替换跳转所在的节点办理人，指定办理的环节且后续节点是固定的办理人员的情况下支持无参与者自动通过，流程办理支持多次撤回
 - 2.3.27：批示意见附件样式调整

package/lib/comment_list/List.js

@@ -146,6 +146,23 @@ var PageHome = function (_React$Component) {
             }
           }).catch(function (error) {});
         });
+      } else if (caESignatureName == '1' && caFirm == 'xjca') {
+        commentList.map(function (item) {
+          var param = {};
+          param.commentId = item.id;
+          _db2.default.FlowApproval.getXinjiangCaImage(param).then(function (content) {
+            var signatureImg = content.image;
+            if (signatureImg && signatureImg != null && signatureImg != '') {
+              if ($("#commentSign-" + item.id).find(".signPic").length > 0) {
+                $("#commentSign-" + item.id).find(".signPic").attr("src", 'data:image/png;base64,' + signatureImg);
+              } else {
+                var signPicHtml = '<img class="t-H64 t-PR5 signPic" src="data:image/png;base64,' + signatureImg + '"/>';
+                $("#commentSign-" + item.id).find('.comment-html').append(signPicHtml);
+                $("#commentSign-" + item.id).find(".userName").css("display", "none");
+              }
+            }
+          }).catch(function (error) {});
+        });
       }
     }
 

package/lib/db/db.js

@@ -274,6 +274,22 @@ context.create('FlowApproval', {
     }
   },
 
+  getXinjiangCaImage: {
+    mockUrl: 'query/getXinjiangCaImage.json',
+    url: _variables2.default.URLS.getXinjiangCaImage,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'POST',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        hasMask: true,
+        duration: 800
+      });
+    }
+  },
+
   getPreTaskInfo: {
     mockUrl: 'query/getPreTaskInfo.json',
     url: _variables2.default.URLS.getPreTaskInfo,

package/lib/db/variables.js

@@ -120,6 +120,7 @@ exports.default = {
         signCA: approveUrlPrefix + "signCA" + '?', //CA加签
         verifySign: approveUrlPrefix + "verifySign" + '?', //CA验签
         getBeiJingCaImage: approveUrlPrefix + "getBeiJingCaImage" + '?', //获取北京CA图片
+        getXinjiangCaImage: approveUrlPrefix + "getXinjiangCaImage" + '?', //获取新疆CA本地签名图
         getPreTaskInfo: approveUrlPrefix + "getPreTaskInfo" + '?', //获取上一环节CA配置
         getApproveCount: approveUrlPrefix + 'getApproveCount?', //获取审批数量
         getUmcCount: umcUrlPrefix + 'getUndoUnreadMsgCount?', //获取待办消息数量

package/lib/form/form.js

@@ -1148,6 +1148,14 @@ var PageHome = function (_React$Component) {
             });
           } else if (typeof value === 'number' && !isNaN(value)) {
             // 接口偶发返回时间戳：保留数字供组件展示，提交值在下方 sync 时格式化
+          } else if (dateFormatShow == 'zhDate' && value && typeof value === 'string' && /年/.test(value)) {
+            // zhDate 兜底：只读回显/脏数据可能是「yyyy年MM月dd日」，勿当无效值清空
+            var zhInitYmd = this.parseZhDateToYmd(value);
+            if (zhInitYmd) {
+              value = new Date(zhInitYmd.replace(/-/g, "/")).getTime();
+            } else {
+              value = null;
+            }
           } else if (value && typeof value === 'string' && value.length >= 10) {
             value = value.substring(0, 19);
             value = new Date(value.replace(/-/g, "/")).getTime();
@@ -2950,6 +2958,24 @@ var PageHome = function (_React$Component) {
       return weekdays[dayIndex];
     }
 
+    // 中文日期「yyyy年MM月dd日」→「yyyy-MM-dd」（zhDate 只读回显用，落库禁止中文）
+
+  }, {
+    key: 'parseZhDateToYmd',
+    value: function parseZhDateToYmd(str) {
+      if (str == null || str === '') {
+        return '';
+      }
+      var m = String(str).trim().match(/^(\d{4})年(\d{1,2})月(\d{1,2})日/);
+      if (!m) {
+        return '';
+      }
+      var zy = m[1];
+      var zm = m[2].length === 1 ? '0' + m[2] : m[2];
+      var zd = m[3].length === 1 ? '0' + m[3] : m[3];
+      return zy + '-' + zm + '-' + zd;
+    }
+
     // 时间字段提交值：统一格式化为字符串，避免 mainTblData 存入时间戳
 
   }, {
@@ -2990,6 +3016,13 @@ var PageHome = function (_React$Component) {
           return mPad + '-' + dPad;
         }
       }
+      // zhDate：展示「xxxx年xx月xx日」，落库必须 yyyy-MM-dd（与 PC data-showtype=zhDate 一致）
+      if (dateFormatShow === 'zhDate' && typeof raw === 'string') {
+        var zhYmd = this.parseZhDateToYmd(raw);
+        if (zhYmd) {
+          return zhYmd;
+        }
+      }
       if (typeof raw === 'string') {
         if (raw.length >= 10 && raw.indexOf('-') >= 0) {
           // 时分字段提交仍只需 HH:mm
@@ -3000,6 +3033,10 @@ var PageHome = function (_React$Component) {
           if (dateFormatShow === 'MonthDay' || dateFormat === 'MD') {
             return this.dateFormat(new Date(raw.replace(/-/g, '/')).getTime(), dateFormat, dateFormatShow) || '';
           }
+          // zhDate / 普通日期：取 yyyy-MM-dd
+          if (dateFormatShow === 'zhDate' || dateFormat === 'YMD') {
+            return raw.substring(0, 10);
+          }
           return raw.substring(0, 19);
         }
         if (/^\d+$/.test(raw)) {
@@ -3007,10 +3044,17 @@ var PageHome = function (_React$Component) {
         }
       }
       if (typeof raw === 'number' && !isNaN(raw)) {
+        // zhDate 落库不要中文展示串
+        if (dateFormatShow === 'zhDate') {
+          return this.dateFormat(raw, 'YMD') || '';
+        }
         return this.dateFormat(raw, dateFormat, dateFormatShow) || '';
       }
       var d = new Date(raw);
       if (!isNaN(d.getTime())) {
+        if (dateFormatShow === 'zhDate') {
+          return this.dateFormat(d.getTime(), 'YMD') || '';
+        }
         return this.dateFormat(d.getTime(), dateFormat, dateFormatShow) || '';
       }
       return '';

package/lib/process_info/processInfo.js

@@ -7903,13 +7903,15 @@ var PageHome = function (_React$Component) {
         key: 'isApproveOrgSwitcherScene',
         value: function isApproveOrgSwitcherScene() {
             var permissionCode = this.state.permissionCode;
-            return permissionCode == 'pending' || permissionCode == 'start' || permissionCode == 'draft';
+            var listType = this.state.listType;
+            return permissionCode == 'pending' || permissionCode == 'start' || permissionCode == 'draft' || listType == '0' || this.state.isStart == true;
         }
     }, {
         key: 'isApproveStartOrgUpdateScene',
         value: function isApproveStartOrgUpdateScene() {
             var permissionCode = this.state.permissionCode;
-            return permissionCode == 'start' || permissionCode == 'draft' || this.state.isStart == true;
+            var listType = this.state.listType;
+            return permissionCode == 'start' || permissionCode == 'draft' || this.state.isStart == true || listType == '0';
         }
     }, {
         key: 'resolveApproveOrgTargetId',

package/package.json

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