fmui-base 2.1.3 → 2.1.4

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,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.1.4:流程表单加载水印
6
7
  - 2.1.3:流程支持取消超时问题处理
7
8
  - 2.1.2:流程支持取消超时
8
9
  - 2.1.1:流程支持取消超时
@@ -1375,6 +1375,10 @@ var PageHome = function (_React$Component) {
1375
1375
  }
1376
1376
  });
1377
1377
  t.dealWithButtons(content, formKey);
1378
+ // 加载流程表单水印
1379
+ console.log("加载流程表单水印");
1380
+ $('#sysWatermarkName').val("sysWatermarkContentBpm");
1381
+ showWaterMarker('approveWaterMarker', "sysWatermarkContentBpm");
1378
1382
  }, function (error) {
1379
1383
  setTimeout(function () {
1380
1384
  _Toast2.default.show({
@@ -1584,12 +1588,12 @@ var PageHome = function (_React$Component) {
1584
1588
  actionSheetButtonOpt: actionSheetButtonOpt,
1585
1589
  buttonIsMore: buttonIsMore
1586
1590
  }, function () {
1587
- if (null != sysWatermark && sysWatermark != '') {
1588
- $('#sysWatermarkName').val(sysWatermark);
1589
- showWaterMarker('approveWaterMarker', sysWatermark);
1590
- } else {
1591
- $('#sysWatermarkName').val('');
1592
- }
1591
+ // if(null!=sysWatermark && sysWatermark!=''){
1592
+ // $('#sysWatermarkName').val(sysWatermark);
1593
+ // showWaterMarker('approveWaterMarker',sysWatermark);
1594
+ // }else{
1595
+ // $('#sysWatermarkName').val('');
1596
+ // }
1593
1597
  });
1594
1598
  }
1595
1599
  }
@@ -5734,13 +5738,14 @@ var PageHome = function (_React$Component) {
5734
5738
  // buttonCodes=buttonCodes.replace('OTHER_RELATION','');
5735
5739
  // buttonCodes=buttonCodes.replace('MAILSEND','');
5736
5740
  if (buttonCodes == null || buttonCodes == '') {
5737
- var sysWatermark = this.state.sysWatermark;
5738
- if (null != sysWatermark && sysWatermark != '') {
5739
- $('#sysWatermarkName').val(sysWatermark);
5740
- showWaterMarker('approveWaterMarker', sysWatermark);
5741
- } else {
5742
- $('#sysWatermarkName').val('');
5743
- }
5741
+ // var sysWatermark=this.state.sysWatermark;
5742
+ // if(null!=sysWatermark && sysWatermark!=''){
5743
+ // $('#sysWatermarkName').val(sysWatermark);
5744
+ // showWaterMarker('approveWaterMarker',sysWatermark);
5745
+ // }else{
5746
+ // $('#sysWatermarkName').val('');
5747
+ // }
5748
+
5744
5749
  } else {
5745
5750
  _db2.default.FlowModuleAPI.getListButtonsByCodes({
5746
5751
  buttonCodes: buttonCodes
@@ -5863,12 +5868,12 @@ var PageHome = function (_React$Component) {
5863
5868
  actionSheetButtonOptName: actionSheetButtonOptName,
5864
5869
  buttonIsMore: buttonIsMore
5865
5870
  }, function () {
5866
- if (null != sysWatermark && sysWatermark != '') {
5867
- $('#sysWatermarkName').val(sysWatermark);
5868
- showWaterMarker('approveWaterMarker', sysWatermark);
5869
- } else {
5870
- $('#sysWatermarkName').val('');
5871
- }
5871
+ // if(null!=sysWatermark && sysWatermark!=''){
5872
+ // $('#sysWatermarkName').val(sysWatermark);
5873
+ // showWaterMarker('approveWaterMarker',sysWatermark);
5874
+ // }else{
5875
+ // $('#sysWatermarkName').val('');
5876
+ // }
5872
5877
  });
5873
5878
  }).catch(function (error) {
5874
5879
  console.error(error);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.3",
3
+ "version": "2.1.4",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",