cloud-module-bpm 6.3.0 → 6.3.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/dist/cloud-module-bpm.common.js +52 -46
- package/dist/cloud-module-bpm.common.js.map +1 -1
- package/dist/cloud-module-bpm.umd.js +52 -46
- package/dist/cloud-module-bpm.umd.js.map +1 -1
- package/dist/cloud-module-bpm.umd.min.js +2 -2
- package/dist/cloud-module-bpm.umd.min.js.map +1 -1
- package/package.json +4 -3
- package/packages/utils/merit-bpm.js +7 -6
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloud-module-bpm",
|
|
3
|
-
"version": "6.3.
|
|
3
|
+
"version": "6.3.4",
|
|
4
4
|
"description": " bpm base lib",
|
|
5
5
|
"main": "dist/cloud-module-bpm.umd.min.js",
|
|
6
6
|
"author": "wujx",
|
|
7
7
|
"private": false,
|
|
8
8
|
"license": "MIT",
|
|
9
|
+
|
|
9
10
|
"scripts": {
|
|
10
11
|
"serve": "vue-cli-service serve --port 8089 ",
|
|
11
12
|
"build": "vue-cli-service build",
|
|
@@ -16,7 +17,7 @@
|
|
|
16
17
|
"axios": "0.19.0",
|
|
17
18
|
"babel-loader": "^8.0.6",
|
|
18
19
|
"babel-polyfill": "^6.26.0",
|
|
19
|
-
"cloud-module-base": "6.3.
|
|
20
|
+
"cloud-module-base": "6.3.2",
|
|
20
21
|
"core-js": "^3.4.4",
|
|
21
22
|
"css-loader": "^3.4.1",
|
|
22
23
|
"element-ui": "^2.13.2",
|
|
@@ -63,4 +64,4 @@
|
|
|
63
64
|
"> 1%",
|
|
64
65
|
"last 2 versions"
|
|
65
66
|
]
|
|
66
|
-
}
|
|
67
|
+
}
|
|
@@ -100,7 +100,7 @@ MeritBPM.open = function(that, params, callback) {
|
|
|
100
100
|
* callback : function(res){ 执行流程相关操作 }
|
|
101
101
|
*/
|
|
102
102
|
MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
|
|
103
|
-
console.log(
|
|
103
|
+
console.log('runzhang' + that);
|
|
104
104
|
let bpmVars = that.getBpmVar(bpmBtn);
|
|
105
105
|
if (typeof bpmBtn == 'object') {
|
|
106
106
|
bpmVars.bpmOperName = bpmBtn.name || ''; //【流程内置变量名】
|
|
@@ -129,9 +129,9 @@ MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
|
|
|
129
129
|
.catch(function(err) {
|
|
130
130
|
that.$message.error(that.$t('base.operation.error') + err);
|
|
131
131
|
});
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
132
|
+
if (window.opener && window.opener.refreshBpmGrid) {
|
|
133
|
+
window.opener.refreshBpmGrid();
|
|
134
|
+
}
|
|
135
135
|
};
|
|
136
136
|
|
|
137
137
|
/**
|
|
@@ -158,6 +158,7 @@ MeritBPM.doSend = function(that, bpmBtn) {
|
|
|
158
158
|
if (
|
|
159
159
|
bpmBtn.isSave == '1' ||
|
|
160
160
|
(that.ruleEngine.procInstId != '' &&
|
|
161
|
+
that.ruleEngine.procInstId != undefined &&
|
|
161
162
|
that.ruleEngine.editStatus.type != '1')
|
|
162
163
|
) {
|
|
163
164
|
bpmBtn.isSave = '0';
|
|
@@ -803,8 +804,8 @@ MeritBPM.validatePermit = function(that, procDefKey, callback) {
|
|
|
803
804
|
* 拼接参数/bpm-demo/example/index.html#/formEdit?id=businessId&undoId=undoId
|
|
804
805
|
*/
|
|
805
806
|
MeritBPM.getUrlParameter = function(name) {
|
|
806
|
-
var query = window.location.
|
|
807
|
-
window.location.
|
|
807
|
+
var query = window.location.href.substring(
|
|
808
|
+
window.location.href.indexOf('?') + 1
|
|
808
809
|
);
|
|
809
810
|
var vars = query.split('&');
|
|
810
811
|
for (var i = 0; i < vars.length; i++) {
|