fmui-base 2.2.5 → 2.2.7

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.7：深圳CA加签验签，支持签名图片
+- 2.2.6：一网通办首页去掉遮罩层，流程列表组件样式调整
 - 2.2.5：移动端支持深圳CA授权
 - 2.2.4：统一待办样式
 - 2.2.3：流程表单样式

package/lib/comment_list/List.js

@@ -108,6 +108,17 @@ var PageHome = function (_React$Component) {
           // },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");
+              }
+            }
+
             if (result == 'success') {
               $("#commentSign-" + item.id).removeClass('t-PR16');
               $("#" + item.id + "_sucess").show();
@@ -254,7 +265,7 @@ var PageHome = function (_React$Component) {
 
         var userNameHtml = _react2.default.createElement(
           'span',
-          { className: 't-PR5' },
+          { className: 't-PR5 userName' },
           item.replacename && item.replacename != "" ? item.replacename : item.userName
         );
         var dateHtml = _react2.default.createElement(
@@ -272,7 +283,7 @@ var PageHome = function (_React$Component) {
           { className: 't-PR5' },
           item.orgShowName
         );
-        var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5', src: t.state.loadImg + item.signPic }) : "";
+        var signPicHtml = 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' },
@@ -299,7 +310,7 @@ var PageHome = function (_React$Component) {
         var replaceHtml = item.replacename && item.replacename != "" ? "(代" + item.userName + "办理)" : "";
         return _react2.default.createElement(
           Box,
-          { style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
+          { className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
           _returnHtml,
           replaceHtml
         );

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

@@ -4979,7 +4979,9 @@ var PageHome = function (_React$Component) {
                 _db2.default.FlowApproval.signCA({
                     bizSn: commentbizSn,
                     relationId: getLoginUserInfo().mobile,
-                    msg: comment
+                    msg: comment,
+                    isComment: '1',
+                    fileName: getLoginUserInfo().mobile
                 }).then(function (content) {}).catch(function (error) {
                     console.log(error);
                 });

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.5",
+  "version": "2.2.7",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",