fmui-base 2.3.67 → 2.3.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +2 -0
  2. package/lib/comment_list/List.js +13 -4
  3. package/lib/form/form.js +6 -2
  4. package/lib/form/table.js +3 -1
  5. package/lib/msg_list/msgList.js +17 -19
  6. package/lib/process_list/processList.js +17 -19
  7. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.3.69：移动端批示意见字段落款支持表单上的自定义样式
7
+ - 2.3.68：批示意见字段支持根据节点设置控制显示隐藏
6
8
  - 2.3.67：邮件转发按钮根据流程设置显示隐藏，办理缓急图标颜色支持自定义
7
9
  - 2.3.66：字段名带$报错转义
8
10
  - 2.3.65：发起按钮选择了邮件转发，则我的流程点开后显示邮件转发按钮
package/lib/comment_list/List.js CHANGED
@@ -352,9 +352,17 @@ var PageHome = function (_React$Component) {
352
352
  // 落款无姓名且无签名图可挂靠时，单独补标识
353
353
  var needTrailingAddlots = addlotsLabel && !showUserName && !(hasSignImg && item.inscriptionShow.indexOf("signImg") >= 0);
354
354
  var replaceHtml = item.replacename && item.replacename != "" ? "(代" + (item.userName || "") + "办理)" : "";
355
+ // 落款字体/颜色与字段内容样式保持一致
356
+ var contentStyle = t.props.contentStyle || {};
357
+ var signStyle = Object.assign({
358
+ marginLeft: "auto",
359
+ textAlign: "right",
360
+ width: '100%',
361
+ position: 'relative'
362
+ }, contentStyle);
355
363
  return _react2.default.createElement(
356
364
  Box,
357
- { className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%', 'position': 'relative' } },
365
+ { className: 'comment-html', style: signStyle },
358
366
  _returnHtml,
359
367
  needTrailingAddlots ? addlotsOnlyHtml : null,
360
368
  replaceHtml
@@ -367,6 +375,7 @@ var PageHome = function (_React$Component) {
367
375
  key: 'render',
368
376
  value: function render() {
369
377
  var t = this;
378
+ var contentStyle = t.props.contentStyle || {};
370
379
  return _react2.default.createElement(
371
380
  'div',
372
381
  null,
@@ -374,8 +383,8 @@ var PageHome = function (_React$Component) {
374
383
  var commentType = item && item.type != null ? String(item.type) : '';
375
384
  return _react2.default.createElement(
376
385
  VBox,
377
- { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
378
- 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(
386
+ { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10', style: contentStyle },
387
+ 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(
379
388
  Box,
380
389
  null,
381
390
  '\'\''
@@ -398,7 +407,7 @@ var PageHome = function (_React$Component) {
398
407
  ) : null,
399
408
  _react2.default.createElement(
400
409
  Box,
401
- { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },
410
+ { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16', style: contentStyle },
402
411
  ' ',
403
412
  item.inscriptionShow ? t.getCommentSign(item) : "",
404
413
  _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 CHANGED
@@ -1294,6 +1294,10 @@ var PageHome = function (_React$Component) {
1294
1294
  this.props.newspyj.documentId = t.state.prefixName + "_" + itemParam.key;
1295
1295
  itemParam.show = true;
1296
1296
  }
1297
+ // 流程数据权限隐藏批示意见字段时，不展示历史意见与输入框（含本节点意见字段被误配隐藏）
1298
+ if (itemParam.isHidden) {
1299
+ itemParam.show = false;
1300
+ }
1297
1301
  } else if (itemType == 'upload' || itemType == 'image') {
1298
1302
  //附件图片
1299
1303
  var formDataAttr = form.dataAttr;
@@ -2178,7 +2182,7 @@ var PageHome = function (_React$Component) {
2178
2182
  // 月日自定义、意见、html 等非 SaltUI 标准内容节点
2179
2183
  scope + ' .t-FL', scope + ' .flex-comment .t-PT10', scope + ' .flex-comment .t-textarea-field-content',
2180
2184
  // 批示意见落款与内容字体颜色一致
2181
- 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 + '}');
2185
+ 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 + '}');
2182
2186
 
2183
2187
  var placeholderCss = this.buildFormCssDecls(cs, { important: true, skipColor: true, withLineHeight: true });
2184
2188
  cssParts.push([scope + ' .t-text-field-placeholder', scope + ' .t-select-field-placeholder', scope + ' .t-datetime-field-placeholder', scope + ' .t-checkbox-field-placeholder'].join(',') + '{' + placeholderCss + '}');
@@ -4986,7 +4990,7 @@ var PageHome = function (_React$Component) {
4986
4990
  t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
4987
4991
  )
4988
4992
  )
4989
- ) : this.state.itemParam.itemType == 'comment' && (this.state.itemParam.show || this.state.isRemoveCommentFormHtml != '1') ? _react2.default.createElement(
4993
+ ) : this.state.itemParam.itemType == 'comment' && !this.state.itemParam.isHidden && (this.state.itemParam.show || this.state.isRemoveCommentFormHtml != '1') ? _react2.default.createElement(
4990
4994
  'div',
4991
4995
  { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
4992
4996
  _react2.default.createElement(
package/lib/form/table.js CHANGED
@@ -542,7 +542,9 @@ var PageHome = function (_React$Component) {
542
542
  }
543
543
  if (this.hasFormStyleProps(cs)) {
544
544
  var contentCss = this.buildFormCssDecls(cs, { important: true, withLineHeight: true });
545
- 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',
545
+ 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',
546
+ // 批示意见落款与内容字体颜色一致
547
+ scope + ' .comment-html', scope + ' .comment-html span', scope + ' .comment-content', scope + ' .ueditor-content',
546
548
  // 弹出选择/只读展示：常带 t-FS16 等工具类，需一并覆盖
547
549
  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 + '}');
548
550
  var placeholderCss = this.buildFormCssDecls(cs, { important: true, skipColor: true, withLineHeight: true });
package/lib/msg_list/msgList.js CHANGED
@@ -194,25 +194,23 @@ var ListItem = function (_React$Component) {
194
194
  if (data.type == 0) {
195
195
  //待办
196
196
  checkIsNotComplete = true;
197
- // 优先枚举 fieldColor；无配置时回退历史 60/70/80/90 样式
198
- if (data.urgencyName && data.fieldColor) {
199
- urgencyTag = true;
200
- tagClass = 'label';
201
- urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
202
- } else if (data.urgency == '90') {
203
- urgencyTag = true;
204
- tagClass = 'label label-danger';
205
- } else if (data.urgency == '80') {
206
- urgencyTag = true;
207
- tagClass = 'label label-danger';
208
- } else if (data.urgency == '70') {
209
- urgencyTag = true;
210
- tagClass = 'label label-warn';
211
- } else if (data.urgency == '60') {
212
- urgencyTag = true;
213
- tagClass = 'label label-primary';
214
- } else {
215
- urgencyTag = false;
197
+ // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
198
+ // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
199
+ if (data.urgencyName) {
200
+ if (data.fieldColor) {
201
+ urgencyTag = true;
202
+ tagClass = 'label';
203
+ urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
204
+ } else if (data.urgency == '90' || data.urgency == '80') {
205
+ urgencyTag = true;
206
+ tagClass = 'label label-danger';
207
+ } else if (data.urgency == '70') {
208
+ urgencyTag = true;
209
+ tagClass = 'label label-warn';
210
+ } else if (data.urgency == '60') {
211
+ urgencyTag = true;
212
+ tagClass = 'label label-primary';
213
+ }
216
214
  }
217
215
  } else if (data.type == 1) {
218
216
  //待阅
package/lib/process_list/processList.js CHANGED
@@ -395,25 +395,23 @@ var ListItem = function (_React$Component) {
395
395
  } else {
396
396
  checkIsNotComplete = true;
397
397
  }
398
- // 优先枚举 fieldColor；无配置时回退历史 60/70/80/90 样式
399
- if (data.urgencyName && data.fieldColor) {
400
- urgencyTag = true;
401
- tagClass = 'label';
402
- urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
403
- } else if (data.urgency == '90') {
404
- urgencyTag = true;
405
- tagClass = 'label label-danger';
406
- } else if (data.urgency == '80') {
407
- urgencyTag = true;
408
- tagClass = 'label label-danger';
409
- } else if (data.urgency == '70') {
410
- urgencyTag = true;
411
- tagClass = 'label label-warn';
412
- } else if (data.urgency == '60') {
413
- urgencyTag = true;
414
- tagClass = 'label label-primary';
415
- } else {
416
- urgencyTag = false;
398
+ // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
399
+ // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
400
+ if (data.urgencyName) {
401
+ if (data.fieldColor) {
402
+ urgencyTag = true;
403
+ tagClass = 'label';
404
+ urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
405
+ } else if (data.urgency == '90' || data.urgency == '80') {
406
+ urgencyTag = true;
407
+ tagClass = 'label label-danger';
408
+ } else if (data.urgency == '70') {
409
+ urgencyTag = true;
410
+ tagClass = 'label label-warn';
411
+ } else if (data.urgency == '60') {
412
+ urgencyTag = true;
413
+ tagClass = 'label label-primary';
414
+ }
417
415
  }
418
416
  } else if (data.listTabType == 1) {
419
417
  //待阅
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.3.67",
3
+ "version": "2.3.69",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",