fmui-base 2.1.3 → 2.1.5
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 +2 -0
- package/lib/process_info/processInfo.js +31 -20
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -248,7 +248,7 @@ var PageHome = function (_React$Component) {
|
|
|
248
248
|
}
|
|
249
249
|
var backTypeList = [{
|
|
250
250
|
value: "1",
|
|
251
|
-
checked:
|
|
251
|
+
checked: true,
|
|
252
252
|
content: '允许提交至退回活动',
|
|
253
253
|
disable: false
|
|
254
254
|
}];
|
|
@@ -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
|
|
1588
|
-
|
|
1589
|
-
|
|
1590
|
-
}
|
|
1591
|
-
|
|
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
|
}
|
|
@@ -2634,6 +2638,12 @@ var PageHome = function (_React$Component) {
|
|
|
2634
2638
|
if (canBackType == '') {
|
|
2635
2639
|
canBackType = '2';
|
|
2636
2640
|
}
|
|
2641
|
+
if (canBackType.indexOf('3') >= 0) {
|
|
2642
|
+
var backTypeList = t.state.backTypeList;
|
|
2643
|
+
t.setState({
|
|
2644
|
+
backTypeSelectList: backTypeList
|
|
2645
|
+
});
|
|
2646
|
+
}
|
|
2637
2647
|
if (selectBackActivity.value == null) {
|
|
2638
2648
|
//没有点击过驳回
|
|
2639
2649
|
_db2.default.FlowModuleAPI.getCanBackActivity({
|
|
@@ -5734,13 +5744,14 @@ var PageHome = function (_React$Component) {
|
|
|
5734
5744
|
// buttonCodes=buttonCodes.replace('OTHER_RELATION','');
|
|
5735
5745
|
// buttonCodes=buttonCodes.replace('MAILSEND','');
|
|
5736
5746
|
if (buttonCodes == null || buttonCodes == '') {
|
|
5737
|
-
var sysWatermark
|
|
5738
|
-
if
|
|
5739
|
-
|
|
5740
|
-
|
|
5741
|
-
}
|
|
5742
|
-
|
|
5743
|
-
}
|
|
5747
|
+
// var sysWatermark=this.state.sysWatermark;
|
|
5748
|
+
// if(null!=sysWatermark && sysWatermark!=''){
|
|
5749
|
+
// $('#sysWatermarkName').val(sysWatermark);
|
|
5750
|
+
// showWaterMarker('approveWaterMarker',sysWatermark);
|
|
5751
|
+
// }else{
|
|
5752
|
+
// $('#sysWatermarkName').val('');
|
|
5753
|
+
// }
|
|
5754
|
+
|
|
5744
5755
|
} else {
|
|
5745
5756
|
_db2.default.FlowModuleAPI.getListButtonsByCodes({
|
|
5746
5757
|
buttonCodes: buttonCodes
|
|
@@ -5863,12 +5874,12 @@ var PageHome = function (_React$Component) {
|
|
|
5863
5874
|
actionSheetButtonOptName: actionSheetButtonOptName,
|
|
5864
5875
|
buttonIsMore: buttonIsMore
|
|
5865
5876
|
}, function () {
|
|
5866
|
-
if
|
|
5867
|
-
|
|
5868
|
-
|
|
5869
|
-
}
|
|
5870
|
-
|
|
5871
|
-
}
|
|
5877
|
+
// if(null!=sysWatermark && sysWatermark!=''){
|
|
5878
|
+
// $('#sysWatermarkName').val(sysWatermark);
|
|
5879
|
+
// showWaterMarker('approveWaterMarker',sysWatermark);
|
|
5880
|
+
// }else{
|
|
5881
|
+
// $('#sysWatermarkName').val('');
|
|
5882
|
+
// }
|
|
5872
5883
|
});
|
|
5873
5884
|
}).catch(function (error) {
|
|
5874
5885
|
console.error(error);
|