fmui-base 1.0.39 → 1.0.40

package/README.md

@@ -3,6 +3,7 @@
 ---
 
 ## 更新日志
+- 1.0.40：修复审批验签重复问题;
 - 1.0.39：移动审批扩展;选人组件问题修复
 - 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务
 - 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置

package/lib/comment_list/List.js

@@ -108,10 +108,12 @@ var PageHome = function (_React$Component) {
         _db2.default.FlowApproval.verifySign(param).then(function (content) {
           var result = content.verifySignRes;
           if (result == 'success') {
+            $("#commentSign-" + item.id).removeClass('t-PR16');
             $("#" + item.id + "_sucess").show();
           }
         }).catch(function (error) {
           if (error.errorMsg == "签名值与原文不匹配") {
+            $("#commentSign-" + item.id).removeClass('t-PR16');
             $("#" + item.id + "_fail").show();
           }
           //  else{
@@ -294,7 +296,7 @@ var PageHome = function (_React$Component) {
         });
         return _react2.default.createElement(
           Box,
-          { style: { marginLeft: "auto", "text-align": "right" } },
+          { style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
           _returnHtml
         );
       } else {
@@ -312,13 +314,13 @@ var PageHome = function (_React$Component) {
           return _react2.default.createElement(
             VBox,
             { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
-            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
+            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16 t-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
               Box,
               null,
               '\'\''
             ) : _react2.default.createElement(
               HBox,
-              null,
+              { className: 't-PR16' },
               _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.loadImg + item.fullMessage })
             ),
             _react2.default.createElement(
@@ -361,14 +363,11 @@ var PageHome = function (_React$Component) {
                 );
               }) : ""
             ),
-            item.inscriptionShow ? t.getCommentSign(item) : "",
             _react2.default.createElement(
               Box,
-              { vAlign: 'start', hAlign: 'end', className: 't-FAR t-omit' },
+              { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },
               ' ',
-              item.signPic == '' || item.signPic == null ? item.userName : '',
-              '\xA0',
-              item.time,
+              item.inscriptionShow ? t.getCommentSign(item) : "",
               _react2.default.createElement('i', { id: item.id + "_sucess", className: 'iconfont icon-checked t-PT10 t-PL3', style: { color: 'green', display: 'none' } }),
               _react2.default.createElement('i', { id: item.id + "_fail", className: 'iconfont icon-close t-PT10 t-PL3', style: { color: 'red', display: 'none' } })
             )

package/lib/comment_list/List.less

@@ -1,3 +1,6 @@
 .t-PR5 {
   padding-right: 5px;
 }
+.t-FBH.flex-comment.t-field-box{
+  padding-right:0px;
+}

package/lib/form/form.js

@@ -2756,7 +2756,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               HBox,
-              { className: 't-field-box' },
+              { className: 'flex-comment t-field-box' },
               _react2.default.createElement(
                 'div',
                 { className: 't-field-layout-h-label t-FS16 t-FBJ' },

package/lib/form/table.js

@@ -1370,7 +1370,7 @@ var PageHome = function (_React$Component) {
 					{ className: t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
-						{ className: 't-field-box' },
+						{ className: 'flex-comment t-field-box' },
 						_react2.default.createElement(
 							'div',
 							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },

package/package.json

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