Skip to content

Commit a9f2e1b

Browse files
authored
Merge pull request #45 from socialblue/develop
closes #44
2 parents fb714c0 + 1d3444e commit a9f2e1b

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"/app.js": "/app.js?id=2f9886a1bf12c1f0d73d",
2+
"/app.js": "/app.js?id=d4940b332a8dd5bf2b6c",
33
"/app.css": "/app.css?id=f844fdaf3875177afce4"
44
}

resources/assets/js/components/query-execute.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="modal-card">
55
<header class="modal-card-head">
66
<p class="modal-card-title">Sql execute</p>
7-
<button class="delete" aria-label="close" v-on:click="active = false"></button>
7+
<button class="delete" aria-label="close" v-on:click="hide"></button>
88
</header>
99
<section class="modal-card-body">
1010
<nav class="panel">
@@ -64,11 +64,18 @@
6464
Axios.get(`/query-adviser/api/query/exec/?time=${this.time}&time-key=${this.timeKey}`).then((response) => {
6565
this.result = response.data;
6666
});
67+
},
68+
69+
hide() {
70+
this.active = false;
71+
this.timeKey = null;
72+
this.time = null;
6773
}
74+
6875
},
6976
7077
created() {
71-
window.EventBus.$on(`show-execute-dialog`, (data) => {
78+
window.EventBus.$on('show-execute-dialog', (data) => {
7279
this.time = data.time;
7380
this.timeKey = data.timeKey;
7481
this.sql = this.format(data.sql);

resources/assets/js/components/query-explain.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="modal-card">
55
<header class="modal-card-head">
66
<p class="modal-card-title">SQL - explain</p>
7-
<button class="delete" aria-label="close" v-on:click="active = false"></button>
7+
<button class="delete" aria-label="close" v-on:click="hide"></button>
88
</header>
99
<section class="modal-card-body">
1010
<div class="button is-primary is-large is-loading" v-if="loading"></div>
@@ -31,28 +31,33 @@
3131
sql: "",
3232
active: false,
3333
loading: false,
34+
timeKey: 0,
35+
time: 0,
3436
}
3537
},
3638
3739
methods: {
3840
3941
loadExplainParts()
4042
{
41-
if (this.explainParts.length > 0) {
42-
return;
43-
}
4443
this.loading = true;
4544
Axios.get('/query-adviser/api/query/explain', {params:{time: this.time, 'time-key': this.timeKey}}).then(resp => {
4645
this.loading = false;
4746
this.explainParts = resp.data.queryParts;
4847
});
48+
},
49+
50+
hide() {
51+
this.active = false;
52+
this.time = 0;
53+
this.timeKey = 0;
54+
this.explainParts = [];
4955
}
5056
},
5157
5258
mounted() {
5359
5460
window.EventBus.$on(`show-explain-dialog`, (data)=> {
55-
5661
this.time = data.time;
5762
this.timeKey = data.timeKey;
5863

0 commit comments

Comments
 (0)