fmui-base 2.0.85 → 2.0.87

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.
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.87:表单组件未用到的批示意见显示隐藏根据传的参数控制
7
+ - 2.0.86:流程列表标题样式
6
8
  - 2.0.85:表单未用到的批示意见默认隐藏
7
9
  - 2.0.84:批量办理回调时报错问题处理
8
10
  - 2.0.83:同一字段关联字段,编辑方式相同时冲突
package/lib/form/form.js CHANGED
@@ -146,6 +146,7 @@ var PageHome = function (_React$Component) {
146
146
  var context = document.getElementById("context").value;
147
147
  //alert(props.defaultValue);
148
148
  var module = props.module && props.module != "undefined" ? props.module : "approve";
149
+ var isRemoveCommentFormHtml = props.isRemoveCommentFormHtml && props.isRemoveCommentFormHtml != "undefined" ? props.isRemoveCommentFormHtml : "0";
149
150
  FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
150
151
  _this.state = {
151
152
  module: module,
@@ -178,7 +179,8 @@ var PageHome = function (_React$Component) {
178
179
  }],
179
180
  savePhrase: [],
180
181
  phraseList: [], //常用语列表
181
- spyj: props.defaultValue
182
+ spyj: props.defaultValue,
183
+ isRemoveCommentFormHtml: isRemoveCommentFormHtml
182
184
  };
183
185
 
184
186
  return _this;
@@ -3262,7 +3264,7 @@ var PageHome = function (_React$Component) {
3262
3264
  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' } }) : ""
3263
3265
  )
3264
3266
  )
3265
- ) : this.state.itemParam.itemType == 'comment' && this.state.itemParam.show ? _react2.default.createElement(
3267
+ ) : this.state.itemParam.itemType == 'comment' && (this.state.itemParam.show || this.state.isRemoveCommentFormHtml != '1') ? _react2.default.createElement(
3266
3268
  'div',
3267
3269
  { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
3268
3270
  _react2.default.createElement(
package/lib/form/table.js CHANGED
@@ -1588,16 +1588,16 @@ var PageHome = function (_React$Component) {
1588
1588
  return _react2.default.createElement(
1589
1589
  'div',
1590
1590
  { className: "form_" + item2.uniqueName },
1591
- _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1591
+ _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1592
1592
  );
1593
1593
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1594
1594
  'div',
1595
1595
  { className: "subform_" + item.itemCode },
1596
- _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1596
+ _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1597
1597
  ) : _react2.default.createElement(
1598
1598
  'div',
1599
1599
  { className: "form_" + item.uniqueName },
1600
- _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1600
+ _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1601
1601
  );
1602
1602
  }.bind(this)) : "" : _react2.default.createElement(
1603
1603
  'div',
@@ -1182,7 +1182,7 @@ var PageHome = function (_React$Component) {
1182
1182
  var barModules = returnDataItem.modules;
1183
1183
  var formCode = returnDataItem.formCode;
1184
1184
  var FlowCommon;
1185
- debugger;
1185
+
1186
1186
  try {
1187
1187
  FlowCommon = require('pages/flow_common/' + barModules).default ? require('pages/flow_common/' + barModules).default : require('pages/flow_common/' + barModules);
1188
1188
  if (typeof FlowCommon !== 'undefined' && typeof FlowCommon.operateCallBack === "function") {
@@ -426,7 +426,8 @@ var PageHome = function (_React$Component) {
426
426
  endSelect: false,
427
427
  mobileFlowChar: '0', //是否开启流程图 1开启 0禁用
428
428
  readScopeId: '',
429
- readScopeList: []
429
+ readScopeList: [],
430
+ isRemoveCommentFormHtml: '0' //是否隐藏无数据的批示意见 1隐藏
430
431
  };
431
432
  FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
432
433
 
@@ -748,9 +749,13 @@ var PageHome = function (_React$Component) {
748
749
  var form = content.form;
749
750
  var readScopeId = '';
750
751
  var readScopeList = [];
752
+ var isRemoveCommentFormHtml = '0';
751
753
  if (content.readScopeId && typeof content.readScopeId != "undefined") {
752
754
  readScopeId = content.readScopeId;
753
755
  }
756
+ if (content.isRemoveCommentFormHtml && typeof content.isRemoveCommentFormHtml != "undefined") {
757
+ isRemoveCommentFormHtml = content.isRemoveCommentFormHtml;
758
+ }
754
759
  if (content.readScopeList && typeof content.readScopeList != "undefined") {
755
760
  readScopeList = content.readScopeList;
756
761
  }
@@ -1311,7 +1316,8 @@ var PageHome = function (_React$Component) {
1311
1316
  dealReminderContent: dealReminderContent,
1312
1317
  mobileFlowChar: mobileFlowChar,
1313
1318
  readScopeId: readScopeId,
1314
- readScopeList: readScopeList
1319
+ readScopeList: readScopeList,
1320
+ isRemoveCommentFormHtml: isRemoveCommentFormHtml
1315
1321
  }, function () {
1316
1322
  t.refs["selectMember_circulate"].initSelectData();
1317
1323
  t.refs["selectMember_circulate1"].initSelectData();
@@ -6632,7 +6638,7 @@ var PageHome = function (_React$Component) {
6632
6638
  _react2.default.createElement(
6633
6639
  _Group2.default.List,
6634
6640
  null,
6635
- this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, onChange: this.change.bind(this) })
6641
+ this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
6636
6642
  )
6637
6643
  )
6638
6644
  )
@@ -366,7 +366,7 @@ var ListItem = function (_React$Component) {
366
366
  ),
367
367
  _react2.default.createElement(
368
368
  Box,
369
- null,
369
+ { className: 'title' },
370
370
  this.props.title
371
371
  )
372
372
  ),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.85",
3
+ "version": "2.0.87",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",