From 74c6fd83a83bb56c21e8723aaa1a046791c165ae Mon Sep 17 00:00:00 2001
From: suwings <suwings@outlook.com>
Date: Thu, 15 Nov 2018 08:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84=E7=9B=91=E5=90=AC=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/template/component/console.html | 5 ++---
 public/template/component/server.html  | 7 ++-----
 public/template/server.html            | 6 +++++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/template/component/console.html b/public/template/component/console.html
index 0061fbe7..a82bbbf2 100644
--- a/public/template/component/console.html
+++ b/public/template/component/console.html
@@ -165,8 +165,7 @@
 <script>
 	MI.rListener('onload', function () {
 
-		var serverName = VIEW_MODEL['ConsolePanel'].serverData.name;
-		MCSERVER.listenServername = serverName;
+		var serverName = MCSERVER.listenServername || "";
 
 		VIEW_MODEL.newVue('ConsolePanel', {
 			el: '#ConsolePanel',
@@ -213,7 +212,7 @@
 				command: "",
 				allowedStart: true,
 				runStatusClass: '',
-				username: MCSERVER.username
+				username: MCSERVER.listenServername
 			},
 			watch: {
 				run: function (cur, old) {}
diff --git a/public/template/component/server.html b/public/template/component/server.html
index 0fe208d5..1c215183 100644
--- a/public/template/component/server.html
+++ b/public/template/component/server.html
@@ -160,14 +160,11 @@
 							top: "15%"
 						},
 						title: "Minecraft Docker 配置",
-						template: "template/dialog/docker_config.html",
-						callback: function (result) {
-							// if (!result) return;
-							// console.log(result)
-						}
+						template: "template/dialog/docker_config.html"
 					});
 				},
 				toConsole: function (serverName) {
+					MCSERVER.listenServername = this.oldServerName;
 					RES.redirectPage('./template/component/console.html', 'server/console', this.oldServerName);
 				},
 				toRebulider: function () {
diff --git a/public/template/server.html b/public/template/server.html
index 6fc0a2cf..989b11b3 100644
--- a/public/template/server.html
+++ b/public/template/server.html
@@ -54,7 +54,7 @@
 									<button class="btn btn-primary" v-on:click="toTerminal(item.serverName);">
 										终端
 									</button>
-									<button class="btn btn-success" v-on:click="onRedirect('./template/component/console.html', 'server/console', item.serverName );">
+									<button class="btn btn-success" v-on:click="toConsole(item.serverName);">
 										控制
 									</button>
 									<button class="btn btn-info" v-on:click="onRedirect('./template/component/server.html','server/get',item.serverName);">
@@ -78,6 +78,10 @@
 		VIEW_MODEL.newVue('ServerList', {
 			el: '#ServerList',
 			methods: {
+				toConsole: function (serverName) {
+					MCSERVER.listenServername = serverName;
+					RES.redirectPage('./template/component/console.html', 'server/console', serverName);
+				},
 				onRedirect: function (link, api, serverName) {
 					RES.redirectPage(link, api, serverName);
 				},