cloud-module-bpm 6.2.8 → 6.2.9
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 +65 -44
- package/dist/cloud-module-bpm.common.js.map +1 -1
- package/dist/cloud-module-bpm.umd.js +65 -44
- package/dist/cloud-module-bpm.umd.js.map +1 -1
- package/dist/cloud-module-bpm.umd.min.js +4 -4
- package/dist/cloud-module-bpm.umd.min.js.map +1 -1
- package/package.json +2 -2
- package/packages/bpm-form-tools/bpm-form-tools.vue +9 -5
- package/packages/utils/merit-bpm.js +6 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloud-module-bpm",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.9",
|
|
4
4
|
"description": " bpm base lib",
|
|
5
5
|
"main": "dist/cloud-module-bpm.umd.min.js",
|
|
6
6
|
"author": "wujx",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"axios": "0.19.0",
|
|
17
17
|
"babel-loader": "^8.0.6",
|
|
18
18
|
"babel-polyfill": "^6.26.0",
|
|
19
|
-
"cloud-module-base": "6.12.
|
|
19
|
+
"cloud-module-base": "6.12.2",
|
|
20
20
|
"core-js": "^3.4.4",
|
|
21
21
|
"css-loader": "^3.4.1",
|
|
22
22
|
"element-ui": "^2.15.7",
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
style="margin-top:5px;"
|
|
6
6
|
:key="bpmBtn.id"
|
|
7
7
|
:type="bpmBtn.type"
|
|
8
|
-
:disabled="bpmBtn.id =='bpmSaveOrUpdateBtn' && flag"
|
|
9
8
|
v-prevent-re-click
|
|
10
9
|
:class="bpmBtn.id"
|
|
11
10
|
v-if='bpmBtn.name!="填写意见"'
|
|
@@ -228,11 +227,16 @@ export default {
|
|
|
228
227
|
},
|
|
229
228
|
//关闭按钮事件
|
|
230
229
|
bpmClose () {
|
|
230
|
+
let hash = window.location.hash || ''
|
|
231
|
+
if(hash.indexOf("userId")==-1){
|
|
231
232
|
//关闭按钮事件，如果有父窗口，则调用父窗口的监听事件
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
233
|
+
if (window.opener && window.opener.refreshBpmGrid) {
|
|
234
|
+
window.opener.refreshBpmGrid();
|
|
235
|
+
window.close();
|
|
236
|
+
} else {
|
|
237
|
+
window.close();
|
|
238
|
+
}
|
|
239
|
+
}else{
|
|
236
240
|
window.close();
|
|
237
241
|
}
|
|
238
242
|
}
|
|
@@ -127,9 +127,12 @@ MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
|
|
|
127
127
|
// that.$message.error(that.$t('base.operation.error') + err);
|
|
128
128
|
that.$message.error('找不到下一节点,请联系管理员！');
|
|
129
129
|
});
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
130
|
+
let hash = window.location.hash || ''
|
|
131
|
+
if(hash.indexOf("userId")==-1){
|
|
132
|
+
if (window.opener && window.opener.refreshBpmGrid) {
|
|
133
|
+
window.opener.refreshBpmGrid();
|
|
134
|
+
}
|
|
135
|
+
}
|
|
133
136
|
};
|
|
134
137
|
|
|
135
138
|
/**
|