fmui-base 2.3.67 → 2.3.68

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 (5) hide show
  1. package/README.md +1 -0
  2. package/lib/form/form.js +5 -1
  3. package/lib/msg_list/msgList.js +17 -19
  4. package/lib/process_list/processList.js +17 -19
  5. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.3.68：批示意见字段支持根据节点设置控制显示隐藏
6
7
  - 2.3.67：邮件转发按钮根据流程设置显示隐藏，办理缓急图标颜色支持自定义
7
8
  - 2.3.66：字段名带$报错转义
8
9
  - 2.3.65：发起按钮选择了邮件转发，则我的流程点开后显示邮件转发按钮
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;
@@ -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/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.68",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",