fmui-base 2.2.75 → 2.2.77

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.2.77: 关联必填时,只读字段不需要必填
7
+ - 2.2.76: 批示意见落款盖章样式调整
6
8
  - 2.2.75: 批示意见落款盖章适配移动端
7
9
  - 2.2.74: 统一待办移动端跳转
8
10
  - 2.2.73: 非空字段隐藏后校验不通过问题修复
@@ -302,7 +302,7 @@ var PageHome = function (_React$Component) {
302
302
  { className: 't-PR5' },
303
303
  item.taskName
304
304
  );
305
- var sealHtml = item.sealFileId && item.sealFileId !== "" ? _react2.default.createElement('img', { className: 't-PR5', src: t.state.loadImg + item.sealFileId, style: { 'position': 'absolute', 'top': '15px', 'right': '10px', 'height': '100px', 'opacity': 0.8 } }) : "";
305
+ var sealHtml = item.sealFileId && item.sealFileId !== "" ? _react2.default.createElement('img', { className: 't-PR5', src: t.state.loadImg + item.sealFileId, style: { 'position': 'absolute', 'top': '-35px', 'right': '10px', 'height': '64px', 'opacity': 0.8 } }) : "";
306
306
  var inscriptionShowArray = item.inscriptionShow.split(",");
307
307
  var _returnHtml = inscriptionShowArray.map(function (inscriptionItem) {
308
308
  if (inscriptionItem) {
@@ -674,12 +674,6 @@ var PageHome = function (_React$Component) {
674
674
  this.setState({
675
675
  itemParam: itemParam
676
676
  });
677
- setTimeout(function () {
678
- if ($('#sysWatermarkName').val() != null && $('#sysWatermarkName').val() != '') {
679
- $('#approveWaterMarker').ezWaterMarkerApprove('clear');
680
- $('#approveWaterMarker').ezWaterMarkerApprove({ text: $('#sysWatermarkName').val(), markWidth: 120, rows: 100 });
681
- }
682
- }, 500);
683
677
  }
684
678
 
685
679
  //新增明细处理数据
package/lib/form/table.js CHANGED
@@ -1051,6 +1051,9 @@ var PageHome = function (_React$Component) {
1051
1051
  if (hideFlag) {
1052
1052
  relaFieldMap["value"] = false;
1053
1053
  }
1054
+ if (defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1 || defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
1055
+ relaFieldMap["value"] = false;
1056
+ }
1054
1057
  var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
1055
1058
  for (var i = 0; i < mainTblData.length; i++) {
1056
1059
  var item = mainTblData[i];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.2.75",
3
+ "version": "2.2.77",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",