fix(项目设置): 执行自定义代码片段一直loading

Closes #12563
This commit is contained in:
shiziyuan9527 2022-04-14 10:57:25 +08:00 committed by 刘瑞斌
parent 524f7384ac
commit cb490d9728
1 changed files with 4 additions and 17 deletions

View File

@ -32,7 +32,7 @@ export default {
watch: { watch: {
// //
reportId() { reportId() {
this.run() this.debugSocket()
}, },
isStop() { isStop() {
if (!this.isStop && this.websocket && this.websocket.close instanceof Function) { if (!this.isStop && this.websocket && this.websocket.close instanceof Function) {
@ -41,21 +41,8 @@ export default {
} }
}, },
methods: { methods: {
initWebSocket() { onOpen() {
let protocol = "ws://"; this.run();
if (window.location.protocol === 'https:') {
protocol = "wss://";
}
const uri = protocol + window.location.host + "/api/definition/run/report/" + this.requestResult.reportId + "/debug";
this.websocket = new WebSocket(uri);
this.websocket.onmessage = this.onMessage;
},
onMessage(e) {
if (e.data) {
let data = JSON.parse(e.data);
this.websocket.close();
this.$emit('runRefresh', data);
}
}, },
onDebugMessage(e) { onDebugMessage(e) {
if (e.data && e.data.startsWith("result_")) { if (e.data && e.data.startsWith("result_")) {
@ -77,6 +64,7 @@ export default {
const uri = protocol + window.location.host + "/ws/" + this.reportId; const uri = protocol + window.location.host + "/ws/" + this.reportId;
this.websocket = new WebSocket(uri); this.websocket = new WebSocket(uri);
this.websocket.onmessage = this.onDebugMessage; this.websocket.onmessage = this.onDebugMessage;
this.websocket.onopen = this.onOpen;
}, },
sort(stepArray) { sort(stepArray) {
if (stepArray) { if (stepArray) {
@ -115,7 +103,6 @@ export default {
reqObj.reportId = this.reportId; reqObj.reportId = this.reportId;
this.$post(url, reqObj, res => { this.$post(url, reqObj, res => {
this.requestResult = res.data; this.requestResult = res.data;
this.debugSocket();
}, () => { }, () => {
this.$emit('errorRefresh', {}); this.$emit('errorRefresh', {});
}) })