fmui-base 2.3.68 → 2.3.69

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.69：移动端批示意见字段落款支持表单上的自定义样式
 - 2.3.68：批示意见字段支持根据节点设置控制显示隐藏
 - 2.3.67：邮件转发按钮根据流程设置显示隐藏，办理缓急图标颜色支持自定义
 - 2.3.66：字段名带$报错转义

package/lib/comment_list/List.js

@@ -352,9 +352,17 @@ var PageHome = function (_React$Component) {
         // 落款无姓名且无签名图可挂靠时，单独补标识
         var needTrailingAddlots = addlotsLabel && !showUserName && !(hasSignImg && item.inscriptionShow.indexOf("signImg") >= 0);
         var replaceHtml = item.replacename && item.replacename != "" ? "(代" + (item.userName || "") + "办理)" : "";
+        // 落款字体/颜色与字段内容样式保持一致
+        var contentStyle = t.props.contentStyle || {};
+        var signStyle = Object.assign({
+          marginLeft: "auto",
+          textAlign: "right",
+          width: '100%',
+          position: 'relative'
+        }, contentStyle);
         return _react2.default.createElement(
           Box,
-          { className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%', 'position': 'relative' } },
+          { className: 'comment-html', style: signStyle },
           _returnHtml,
           needTrailingAddlots ? addlotsOnlyHtml : null,
           replaceHtml
@@ -367,6 +375,7 @@ var PageHome = function (_React$Component) {
     key: 'render',
     value: function render() {
       var t = this;
+      var contentStyle = t.props.contentStyle || {};
       return _react2.default.createElement(
         'div',
         null,
@@ -374,8 +383,8 @@ var PageHome = function (_React$Component) {
           var commentType = item && item.type != null ? String(item.type) : '';
           return _react2.default.createElement(
             VBox,
-            { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
-            commentType.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : String(item.fullMessage).replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
+            { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10', style: contentStyle },
+            commentType.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-PR16 comment-content', style: contentStyle, dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : String(item.fullMessage).replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
               Box,
               null,
               '\'\''
@@ -398,7 +407,7 @@ var PageHome = function (_React$Component) {
             ) : null,
             _react2.default.createElement(
               Box,
-              { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },
+              { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16', style: contentStyle },
               ' ',
               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' } }),

package/lib/form/form.js

@@ -2182,7 +2182,7 @@ var PageHome = function (_React$Component) {
         // 月日自定义、意见、html 等非 SaltUI 标准内容节点
         scope + ' .t-FL', scope + ' .flex-comment .t-PT10', scope + ' .flex-comment .t-textarea-field-content',
         // 批示意见落款与内容字体颜色一致
-        scope + ' .comment-html', scope + ' .comment-html span', scope + ' .ueditor-content', scope + ' .t-FB1.t-FAL', scope + ' .t-FB1.t-omit', scope + ' .t-omit', scope + ' .t-LH1_4', scope + ' .t-FS16', scope + ' .t-field-box.t-FS16', scope + ' .t-field-box.t-FS16 .t-FB1', scope + ' .section-content .t-FB1'].join(',') + '{' + contentCss + '}');
+        scope + ' .comment-html', scope + ' .comment-html span', scope + ' .comment-content', scope + ' .ueditor-content', scope + ' .t-FB1.t-FAL', scope + ' .t-FB1.t-omit', scope + ' .t-omit', scope + ' .t-LH1_4', scope + ' .t-FS16', scope + ' .t-field-box.t-FS16', scope + ' .t-field-box.t-FS16 .t-FB1', scope + ' .section-content .t-FB1'].join(',') + '{' + contentCss + '}');
 
         var placeholderCss = this.buildFormCssDecls(cs, { important: true, skipColor: true, withLineHeight: true });
         cssParts.push([scope + ' .t-text-field-placeholder', scope + ' .t-select-field-placeholder', scope + ' .t-datetime-field-placeholder', scope + ' .t-checkbox-field-placeholder'].join(',') + '{' + placeholderCss + '}');

package/lib/form/table.js

@@ -542,7 +542,9 @@ var PageHome = function (_React$Component) {
 			}
 			if (this.hasFormStyleProps(cs)) {
 				var contentCss = this.buildFormCssDecls(cs, { important: true, withLineHeight: true });
-				cssParts.push([scope + ' .t-text-field-input', scope + ' .t-text-field-content-main', scope + ' .t-text-field-content-main span', scope + ' .t-field-content-box > .t-FB1', scope + ' .t-field-content-box > .t-FB1 span', scope + ' .t-field-multi', scope + ' .t-field-multi span', scope + ' .t-select-field-value', scope + ' .t-select-field-value span', scope + ' .t-radio-field-value', scope + ' .t-radio-field-value span', scope + ' .t-radio-field-value .t-FB1', scope + ' .t-radio-field-value .t-omit', scope + ' .t-datetime-field-value', scope + ' .t-datetime-field-value span', scope + ' .t-textarea-field-content', scope + ' .t-textarea-field-content textarea', scope + ' .t-checkbox-field-content', scope + ' .t-checkbox-field-label', scope + ' .t-checkbox-field-value-list', scope + ' .t-checkbox-field-value-list span', scope + ' .dd-select-input-option-text', scope + ' .t-popuser-value', scope + ' .t-popuser-value span', scope + ' .t-popuser-placeholder', scope + ' .t-poppage-value', scope + ' .t-poppage-value span', scope + ' .t-poppage-placeholder', scope + ' .t-FL', scope + ' .flex-comment .t-textarea-field-content', scope + ' .ueditor-content',
+				cssParts.push([scope + ' .t-text-field-input', scope + ' .t-text-field-content-main', scope + ' .t-text-field-content-main span', scope + ' .t-field-content-box > .t-FB1', scope + ' .t-field-content-box > .t-FB1 span', scope + ' .t-field-multi', scope + ' .t-field-multi span', scope + ' .t-select-field-value', scope + ' .t-select-field-value span', scope + ' .t-radio-field-value', scope + ' .t-radio-field-value span', scope + ' .t-radio-field-value .t-FB1', scope + ' .t-radio-field-value .t-omit', scope + ' .t-datetime-field-value', scope + ' .t-datetime-field-value span', scope + ' .t-textarea-field-content', scope + ' .t-textarea-field-content textarea', scope + ' .t-checkbox-field-content', scope + ' .t-checkbox-field-label', scope + ' .t-checkbox-field-value-list', scope + ' .t-checkbox-field-value-list span', scope + ' .dd-select-input-option-text', scope + ' .t-popuser-value', scope + ' .t-popuser-value span', scope + ' .t-popuser-placeholder', scope + ' .t-poppage-value', scope + ' .t-poppage-value span', scope + ' .t-poppage-placeholder', scope + ' .t-FL', scope + ' .flex-comment .t-textarea-field-content', scope + ' .flex-comment .t-PT10',
+				// 批示意见落款与内容字体颜色一致
+				scope + ' .comment-html', scope + ' .comment-html span', scope + ' .comment-content', scope + ' .ueditor-content',
 				// 弹出选择/只读展示：常带 t-FS16 等工具类，需一并覆盖
 				scope + ' .t-FB1.t-FAL', scope + ' .t-FB1.t-omit', scope + ' .t-omit', scope + ' .t-LH1_4', scope + ' .t-FS16', scope + ' .t-field-box.t-FS16', scope + ' .t-field-box.t-FS16 .t-FB1', scope + ' .section-content .t-FB1'].join(',') + '{' + contentCss + '}');
 				var placeholderCss = this.buildFormCssDecls(cs, { important: true, skipColor: true, withLineHeight: true });

package/package.json

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