fmui-base 2.3.74 → 2.3.76

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.76：表单的单选多选字段选项未换行显示全
+- 2.3.75：移动端表单能支持自定义上下边距
 - 2.3.74：移动端流程办理支持流程办理人增加由所选活动指定办理人员
 - 2.3.73：移动端流程表单增加退回后重新提交前的批示意见在表单下方显示
 - 2.3.72：移动端表单设置自定义样式时图标乱码问题

package/lib/form/form.js

@@ -601,8 +601,10 @@ var PageHome = function (_React$Component) {
       var formStyle = t.props.formStyle; //统一样式
       var subStyle = form.itemStyle; //每个样式
 
-      var style = { contentStyle: {}, titleStyle: {} };
+      var style = { contentStyle: {}, titleStyle: {}, fieldPadding: 18 };
       if (formStyle != null && formStyle != '' && formStyle != undefined) {
+        // 表单级控件上下内边距（默认18，最大24）
+        style.fieldPadding = this.normalizeFieldPadding(formStyle.fieldPadding);
         if (formStyle.contentStyle != null && formStyle.contentStyle != '' && formStyle.contentStyle != undefined) {
           if (formStyle.contentStyle.color != null && formStyle.contentStyle.color != undefined) {
             style.contentStyle.color = formStyle.contentStyle.color;
@@ -2108,6 +2110,34 @@ var PageHome = function (_React$Component) {
       return !!(styleObj.fontFamily || styleObj.fontSize || styleObj.color || styleObj.fontWeight || styleObj.fontStyle);
     }
 
+    /** 控件上下内边距：默认 18，最大 24 */
+
+  }, {
+    key: 'normalizeFieldPadding',
+    value: function normalizeFieldPadding(val) {
+      var n = parseInt(val, 10);
+      if (isNaN(n)) {
+        n = 18;
+      }
+      if (n < 0) {
+        n = 0;
+      }
+      if (n > 24) {
+        n = 24;
+      }
+      return n;
+    }
+
+    /** 覆盖标签/内容区上下内边距，左右 padding 保持原样式 */
+
+  }, {
+    key: 'buildFieldPaddingCss',
+    value: function buildFieldPaddingCss(scope, formStyleObj) {
+      var padding = this.normalizeFieldPadding(formStyleObj && formStyleObj.fieldPadding);
+      var px = padding + 'px';
+      return [[scope + ' .t-field-layout-h-label', scope + ' .t-field-layout-v-label', scope + ' .t-field-layout-v-label-left'].join(',') + '{padding-top:' + px + ' !important;padding-bottom:' + px + ' !important;}', [scope + ' .t-field .t-field-layout-h-label+.t-field-multi', scope + ' .t-field-layout-h-label+.t-field-multi'].join(',') + '{padding-top:' + px + ' !important;padding-bottom:' + px + ' !important;}'].join('');
+    }
+
     // 组装 CSS 声明；important=true 用于压过 SaltUI 固定字号
     // options.skipFontFamily：避免字段字体覆盖 iconfont 图标
 
@@ -2172,6 +2202,7 @@ var PageHome = function (_React$Component) {
       var cssParts = [];
       var subColumnCount = parseInt(this.props.subColumnCount, 10);
       var isSubFormMultiCol = this.props.dataType === 'sub' && !isNaN(subColumnCount) && subColumnCount > 1;
+      cssParts.push(this.buildFieldPaddingCss(scope, formStyleObj));
 
       if (this.hasFormStyleProps(ts)) {
         var labelCss = this.buildFormCssDecls(ts, { important: true, withLineHeight: true });

package/lib/form/form.less

@@ -81,6 +81,39 @@
   }
 }
 
+// 多选 CheckboxField list / SelectLayer：长选项换行显示全（覆盖 SaltUI nowrap/ellipsis）
+.t-checkbox-field,
+.t-checkbox-field-row,
+.t-select-layer {
+  .t-checkbox-field-content,
+  .item-content {
+    flex: 1;
+    min-width: 0;
+    max-width: 100%;
+    white-space: normal !important;
+    word-break: break-word !important;
+    overflow-wrap: break-word !important;
+    word-wrap: break-word !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    -webkit-line-clamp: unset !important;
+    line-clamp: unset !important;
+    line-height: 1.5;
+  }
+
+  .t-checkbox-field-row,
+  .select-layer-item {
+    align-items: flex-start;
+    min-height: auto;
+  }
+
+  .t-checkbox-field-icon-wrapper {
+    align-items: flex-start;
+    flex-shrink: 0;
+    padding-top: 2px;
+  }
+}
+
 .form-radio-field-wrap {
   // popup 弹层选项列表：对齐 CheckboxField SelectLayer 的行高、间距与字体
   &.t-radio-field.is-group {

package/lib/form/table.js

@@ -479,6 +479,34 @@ var PageHome = function (_React$Component) {
 			}
 			return !!(styleObj.fontFamily || styleObj.fontSize || styleObj.color || styleObj.fontWeight || styleObj.fontStyle);
 		}
+
+		/** 控件上下内边距：默认 18，最大 24 */
+
+	}, {
+		key: 'normalizeFieldPadding',
+		value: function normalizeFieldPadding(val) {
+			var n = parseInt(val, 10);
+			if (isNaN(n)) {
+				n = 18;
+			}
+			if (n < 0) {
+				n = 0;
+			}
+			if (n > 24) {
+				n = 24;
+			}
+			return n;
+		}
+
+		/** 覆盖标签/内容区上下内边距，左右 padding 保持原样式 */
+
+	}, {
+		key: 'buildFieldPaddingCss',
+		value: function buildFieldPaddingCss(scope, formStyleObj) {
+			var padding = this.normalizeFieldPadding(formStyleObj && formStyleObj.fieldPadding);
+			var px = padding + 'px';
+			return [[scope + ' .t-field-layout-h-label', scope + ' .t-field-layout-v-label', scope + ' .t-field-layout-v-label-left'].join(',') + '{padding-top:' + px + ' !important;padding-bottom:' + px + ' !important;}', [scope + ' .t-field .t-field-layout-h-label+.t-field-multi', scope + ' .t-field-layout-h-label+.t-field-multi'].join(',') + '{padding-top:' + px + ' !important;padding-bottom:' + px + ' !important;}'].join('');
+		}
 	}, {
 		key: 'buildFormCssDecls',
 		value: function buildFormCssDecls(styleObj, options) {
@@ -541,6 +569,7 @@ var PageHome = function (_React$Component) {
 			var cs = formStyleObj.contentStyle || {};
 			var scope = '.fmui-form-style-root';
 			var cssParts = [];
+			cssParts.push(this.buildFieldPaddingCss(scope, formStyleObj));
 			if (this.hasFormStyleProps(ts)) {
 				var labelCss = this.buildFormCssDecls(ts, { important: true, withLineHeight: true });
 				var fontSizeNum = parseInt(ts.fontSize, 10);

package/lib/process_info/processInfo.js

@@ -841,6 +841,8 @@ var PageHome = function (_React$Component) {
                 taskId: taskId,
                 processInstanceId: processInstanceId,
                 type: listType,
+                // 撤回可编辑批示意见：匹配当前办理人时必须带 userId（与 comment.userId/createdBy 比对）
+                userId: t.state.userId,
                 //startUserId:startUserId,
                 module: this.state.module,
                 isSub: isSub
@@ -1523,11 +1525,16 @@ var PageHome = function (_React$Component) {
                         }
                         // 抢占加签/转交自动返回后，被加签人意见与加签人待办共用同一 taskId。
                         // 必须同时校验办理人，否则会把他人意见回填进当前编辑框并挤出历史列表。
+                        // 撤回 enableEditRecallComment：后端会把原意见 taskId 绑到新待办，此处回填到编辑框（与 PC active=1 对齐）。
                         var commentOwnerId = commentList[_i].userId || commentList[_i].createdBy || '';
-                        if (commentField == commentList[_i].field && commentList[_i].taskId == param.taskId && commentOwnerId && commentOwnerId == param.userId) {
+                        var currentUserId = param.userId || t.state.userId || '';
+                        if (commentField == commentList[_i].field && commentList[_i].taskId == param.taskId && commentOwnerId && currentUserId && commentOwnerId == currentUserId) {
                             newspyj = commentList[_i];
                             commentId = commentList[_i].id;
-                            defaultValue = commentList[_i].content;
+                            // 接口字段为 fullMessage，content 可能为空
+                            var recallCommentText = commentList[_i].fullMessage != null && commentList[_i].fullMessage !== '' ? commentList[_i].fullMessage : commentList[_i].content || '';
+                            defaultValue = recallCommentText;
+                            newspyj.content = recallCommentText;
                             continue;
                         }
                         if (commentItem.field != 'default' && commentItem.commenttype != 'back') {
@@ -5874,6 +5881,7 @@ var PageHome = function (_React$Component) {
                 taskId: t.state.taskId,
                 processInstanceId: t.state.processInstanceId,
                 type: t.state.listType,
+                userId: t.state.userId,
                 module: t.state.module,
                 isSub: isSub
             };

package/lib/select_input/selectInput.less

@@ -4,15 +4,16 @@
      box-sizing: border-box;
 }
 
-/* 与 PC 一致：图标 + 选项文案 + 填空同一行；长提示在填空框内换行 */
+/* 与 PC 一致：图标 + 选项文案 + 填空；长选项文案换行显示全 */
 .dd-select-input-option {
      display: flex;
      flex-direction: row;
-     flex-wrap: nowrap;
+     flex-wrap: wrap;
      align-items: flex-start;
      margin: 8px 12px 8px 0;
      cursor: pointer;
      min-width: 0;
+     width: 100%;
      box-sizing: border-box;
 }
 
@@ -73,11 +74,15 @@
 }
 
 .dd-select-input-option-text {
-     flex: 0 0 auto;
+     flex: 1 1 auto;
      margin-right: 8px;
      margin-top: 4px;
      min-width: 32px;
+     max-width: 100%;
      line-height: 1.47;
+     white-space: normal;
+     word-break: break-word;
+     overflow-wrap: anywhere;
 }
 
 /* 紧挨选项文案，占满剩余宽度；长 placeholder 在框内换行 */

package/package.json

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