fmui-base 2.3.32 → 2.3.34

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.34：移动端支持新疆CA电子签章功能，去除截图base64png图片的操作
+- 2.3.33：移动端支持新疆CA电子签章功能，移动端选人组件增加一些再次加载的入口
 - 2.3.32：移动端子表字段为空时不存，只读情况下不再默认拼一行空子表
 - 2.3.31：移动端推送点开的流程表单切换组织不显示，集成新疆CA
 - 2.3.30：移动端日期型字段日期格式（xx年xx月xx日）移动端办理后丢失

package/lib/comment_list/List.js

@@ -53,36 +53,145 @@ var PageHome = function (_React$Component) {
 
     var _this = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
+    var list = props.list || [];
     _this.state = {
       loadImg: _variables2.default.loadImg + "&fid=",
-      commentList: props.list || []
+      commentList: list,
+      // 意见表 ca_signature_img：有值则优先渲染（可来自接口字段或二次拉取）
+      caSignatureMap: _this.buildCaSignatureMap(list)
     };
-
     return _this;
   }
 
   _createClass(PageHome, [{
+    key: 'buildCaSignatureMap',
+    value: function buildCaSignatureMap(list) {
+      var map = {};
+      if (!list || !list.length) {
+        return map;
+      }
+      for (var i = 0; i < list.length; i++) {
+        var item = list[i];
+        if (item && item.id && item.caSignatureImg) {
+          var img = this.normalizeBase64(item.caSignatureImg);
+          if (img) {
+            map[item.id] = img;
+          }
+        }
+      }
+      return map;
+    }
+  }, {
     key: 'componentDidMount',
     value: function componentDidMount() {
       var t = this;
+      var list = t.props.list || [];
       t.setState({
-        commentList: t.props.list || []
+        commentList: list,
+        caSignatureMap: Object.assign({}, t.state.caSignatureMap, t.buildCaSignatureMap(list))
       }, function () {
-        t.casigin();
+        t.casigin(t.props);
       });
     }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      var t = this;
+      var nextList = nextProps.list || [];
+      var prevList = this.props.list || [];
+      var listChanged = nextList !== prevList || nextList.length !== prevList.length || nextList[0] && prevList[0] && nextList[0].id !== prevList[0].id;
+      var caChanged = nextProps.caFirm !== this.props.caFirm || nextProps.caESignatureName !== this.props.caESignatureName || nextProps.caFormSign !== this.props.caFormSign;
+      if (listChanged) {
+        t.setState({
+          commentList: nextList,
+          caSignatureMap: Object.assign({}, t.state.caSignatureMap, t.buildCaSignatureMap(nextList))
+        }, function () {
+          t.casigin(nextProps);
+        });
+      } else if (caChanged) {
+        t.casigin(nextProps);
+      }
+    }
 
-    //批示意见验签
+    /** 去掉 dataURL 前缀与空白，保留完整 base64（禁止按 PNG 尾标截取） */
+
+  }, {
+    key: 'normalizeBase64',
+    value: function normalizeBase64(signatureImg) {
+      if (!signatureImg) {
+        return '';
+      }
+      var imgData = String(signatureImg);
+      var base64Mark = 'base64,';
+      var markIdx = imgData.indexOf(base64Mark);
+      if (markIdx > -1) {
+        imgData = imgData.substring(markIdx + base64Mark.length);
+      }
+      return imgData.replace(/\s+/g, '');
+    }
+  }, {
+    key: 'applyCaSignatureImg',
+    value: function applyCaSignatureImg(commentId, signatureImg) {
+      var t = this;
+      if (!commentId || !signatureImg) {
+        return;
+      }
+      var imgData = t.normalizeBase64(signatureImg);
+      if (!imgData) {
+        return;
+      }
+      t.setState(function (prev) {
+        var map = Object.assign({}, prev.caSignatureMap || {});
+        if (map[commentId] === imgData) {
+          return null;
+        }
+        map[commentId] = imgData;
+        return { caSignatureMap: map };
+      });
+    }
+
+    /** 按意见 id 补拉 ca_signature_img（仅补列表里还没有的） */
+
+  }, {
+    key: 'loadCaSignatureImgs',
+    value: function loadCaSignatureImgs(commentList) {
+      var t = this;
+      if (!commentList || !commentList.length) {
+        return;
+      }
+      commentList.forEach(function (item) {
+        if (!item || !item.id) {
+          return;
+        }
+        if (t.state.caSignatureMap && t.state.caSignatureMap[item.id]) {
+          return;
+        }
+        _db2.default.FlowApproval.getXinjiangCaImage({ commentId: item.id }).then(function (content) {
+          var signatureImg = content && content.image;
+          if (signatureImg) {
+            t.applyCaSignatureImg(item.id, signatureImg);
+          }
+        }).catch(function () {});
+      });
+    }
+
+    //批示意见验签 / 本地签名快照落款
 
   }, {
     key: 'casigin',
-    value: function casigin() {
+    value: function casigin(props) {
       console.log("批示意见验签");
-      var commentList = this.props.list;
-      var isCaUser = this.props.isCaUser; //是否是CA加签用户
-      var caFirm = this.props.caFirm; //是否是开启CA加签
-      var caESignatureName = this.props.caESignatureName; //CA电子签名名称
-      var caFormSign = this.props.caFormSign; //CA表单签名
+      props = props || this.props;
+      var commentList = props.list;
+      var isCaUser = props.isCaUser;
+      var caFirm = props.caFirm;
+      var caESignatureName = props.caESignatureName;
+      var caFormSign = props.caFormSign;
+      var t = this;
+
+      // 有 ca_signature_img 一律按该图渲染：先用列表字段，缺的再按 id 补拉
+      t.loadCaSignatureImgs(commentList);
+
       if (commentList && caFirm && caFirm != '' && caFormSign == '1') {
         commentList.map(function (item) {
           var param = {};
@@ -90,20 +199,11 @@ var PageHome = function (_React$Component) {
           param.relationId = getLoginUserInfo().mobile;
           param.msg = item.fullMessage;
           param.commentId = item.id;
-          // setTimeout(function(){
-          //   $("#"+item.id+"_sucess").show();
-          // },1000)
           _db2.default.FlowApproval.verifySign(param).then(function (content) {
             var result = content.verifySignRes;
             var signatureImg = content.signatureImg;
             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");
-              }
+              t.applyCaSignatureImg(item.id, signatureImg);
             }
 
             if (result == 'success') {
@@ -115,12 +215,6 @@ var PageHome = function (_React$Component) {
               $("#commentSign-" + item.id).removeClass('t-PR16');
               $("#" + item.id + "_fail").show();
             }
-            //  else{
-            //   Toast.show({
-            //     type: 'error',
-            //     content: error.errorMsg,
-            //   });
-            //  }
           });
         });
       } else if (caESignatureName == '1' && isCaUser == '1' && caFirm == 'bjca') {
@@ -130,36 +224,10 @@ var PageHome = function (_React$Component) {
           param.relationId = getLoginUserInfo().mobile;
           param.msg = item.fullMessage;
           param.commentId = item.id;
-          // setTimeout(function(){
-          //   $("#"+item.id+"_sucess").show();
-          // },1000)
           _db2.default.FlowApproval.getBeiJingCaImage(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) {});
-        });
-      } 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");
-              }
+              t.applyCaSignatureImg(item.id, signatureImg);
             }
           }).catch(function (error) {});
         });
@@ -210,7 +278,9 @@ var PageHome = function (_React$Component) {
           { className: 't-PR5' },
           item.orgShowName
         );
-        var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: t.state.loadImg + item.signPic }) : "";
+        var caImg = t.state.caSignatureMap && t.state.caSignatureMap[item.id] || t.normalizeBase64(item.caSignatureImg);
+        var hasSignImg = !!(caImg || item.signPic != null && item.signPic !== '');
+        var signPicHtml = caImg ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: 'data:image/png;base64,' + caImg }) : item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: t.state.loadImg + item.signPic }) : "";
         var taskNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5' },
@@ -220,7 +290,7 @@ var PageHome = function (_React$Component) {
         var inscriptionShowArray = item.inscriptionShow.split(",");
         var _returnHtml = inscriptionShowArray.map(function (inscriptionItem) {
           if (inscriptionItem) {
-            if (inscriptionItem == "userName" && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && (typeof item.signPic == 'undefined' || item.signPic == null || item.signPic == ""))) {
+            if (inscriptionItem == "userName" && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && !hasSignImg)) {
               return userNameHtml;
             } else if (inscriptionItem == "date") {
               return dateHtml;

package/lib/db/db.js

@@ -280,14 +280,8 @@ context.create('FlowApproval', {
     header: {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
-    method: 'POST',
-    willFetch: function willFetch() {
-      _Toast2.default.show({
-        content: _react2.default.createElement(_loading2.default, null),
-        hasMask: true,
-        duration: 800
-      });
-    }
+    method: 'POST'
+    // 静默读取本地快照，避免每条意见都弹出 Loading 遮罩
   },
 
   getPreTaskInfo: {

package/lib/form/form.js

@@ -4916,7 +4916,7 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-PT10 t-FB1' },
-                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName }),
+                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign }),
                 _react2.default.createElement(
                   'div',
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },

package/lib/selectMember/select.js

@@ -387,11 +387,33 @@ var Page = function (_React$Component) {
 
   }, {
     key: 'componentWillReceiveProps',
-    value: function componentWillReceiveProps() {
-      this.setState({
-        showSecret: this.props.showSecret, //是否开启定密  true/false
-        secretlevel: this.props.secretlevel == null ? "" : this.props.secretlevel //密级       绝密-1/机密-2/秘密-3/非密-4
-      });
+    value: function componentWillReceiveProps(nextProps) {
+      var nextState = {
+        showSecret: nextProps.showSecret, //是否开启定密  true/false
+        secretlevel: nextProps.secretlevel == null ? "" : nextProps.secretlevel //密级       绝密-1/机密-2/秘密-3/非密-4
+      };
+      // 字段关联动态改必填/只读时，需同步到 state，否则红星标识不刷新
+      if (typeof nextProps.required !== 'undefined' && nextProps.required !== this.state.required) {
+        nextState.required = nextProps.required;
+      }
+      if (typeof nextProps.readOnly !== 'undefined' && nextProps.readOnly !== this.state.readOnly) {
+        nextState.readOnly = nextProps.readOnly;
+      }
+      // 显式传 isDelete 时以 props 为准；未传时随 readOnly 推导（表单选人常用）
+      if (typeof nextProps.isDelete !== 'undefined') {
+        if (nextProps.isDelete !== this.state.isDelete) {
+          nextState.isDelete = nextProps.isDelete;
+        }
+      } else if (typeof nextProps.readOnly !== 'undefined' && nextProps.readOnly !== this.state.readOnly) {
+        nextState.isDelete = !nextProps.readOnly;
+      }
+      if (typeof nextProps.label !== 'undefined' && nextProps.label !== this.state.label) {
+        nextState.label = nextProps.label;
+      }
+      if (typeof nextProps.placeholder !== 'undefined' && nextProps.placeholder !== this.state.placeholder) {
+        nextState.placeholder = nextProps.placeholder;
+      }
+      this.setState(nextState);
     }
 
     //检查是否有额外tab

package/package.json

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