From 0d92e9fb0987dc68471f3468508abf97a86893ca Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 21 Dec 2022 16:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B2=A1=E6=9C=89=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=89=80=E5=B1=9E=E7=94=A8=E6=88=B7=E6=97=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E8=AE=BE=E7=BD=AE=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/server/settings/index.go  | 23 +++++++++++++++----
 .../servers/server/settings/index.html        | 12 ++++++++--
 .../@default/servers/server/settings/index.js |  6 +++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go
index a0fb636f..938950fe 100644
--- a/internal/web/actions/default/servers/server/settings/index.go
+++ b/internal/web/actions/default/servers/server/settings/index.go
@@ -121,6 +121,7 @@ func (this *IndexAction) RunGet(params struct {
 // RunPost 保存
 func (this *IndexAction) RunPost(params struct {
 	ServerId       int64
+	UserId         int64
 	Name           string
 	Description    string
 	ClusterId      int64
@@ -157,16 +158,28 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 
-	// 修改套餐
-	if params.UserPlanId > 0 {
-		_, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{
-			ServerId:   params.ServerId,
-			UserPlanId: params.UserPlanId,
+	// 修改用户
+	if params.UserId > 0 {
+		_, err = this.RPC().ServerRPC().UpdateServerUser(this.AdminContext(), &pb.UpdateServerUserRequest{
+			ServerId: params.ServerId,
+			UserId:   params.UserId,
 		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
+	} else {
+		// 修改套餐
+		if params.UserPlanId > 0 {
+			_, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{
+				ServerId:   params.ServerId,
+				UserPlanId: params.UserPlanId,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
 	}
 
 	this.Success()
diff --git a/web/views/@default/servers/server/settings/index.html b/web/views/@default/servers/server/settings/index.html
index 9051279e..ab495671 100644
--- a/web/views/@default/servers/server/settings/index.html
+++ b/web/views/@default/servers/server/settings/index.html
@@ -10,7 +10,15 @@
                 <td>所属用户</td>
                 <td>
                     <span v-if="user != null">{{user.fullname}} <span class="small">（{{user.username}}）</span><link-icon :href="'/users/user?userId=' + user.id"></link-icon></span>
-                    <span v-else class="disabled">-</span>
+                    <div v-if="user == null">
+                        <div v-show="!userSelectorVisible">
+                            <span class="disabled">没有指定用户</span> &nbsp; <a href="" @click.prevent="showUserSelector">[指定用户]</a>
+                        </div>
+                        <div v-show="userSelectorVisible">
+                            <user-selector style="display:inline-block"></user-selector>
+                            <p class="comment"><span class="red">修改服务所属用户时需要同时保证证书、域名等信息也属于该用户，否则可能产生难以预料的结果。</span></p>
+                        </div>
+                    </div>
                 </td>
             </tr>
 			<tr>
@@ -66,7 +74,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td>是否启用</td>
+					<td>启用当前服务</td>
 					<td>
 						<div class="ui checkbox">
 							<input type="checkbox" name="isOn" value="1" v-model="server.isOn"/>
diff --git a/web/views/@default/servers/server/settings/index.js b/web/views/@default/servers/server/settings/index.js
index 3189b9e5..4259c137 100644
--- a/web/views/@default/servers/server/settings/index.js
+++ b/web/views/@default/servers/server/settings/index.js
@@ -4,6 +4,12 @@ Tea.context(function () {
 	/**
 	 * 用户相关
 	 */
+	this.userSelectorVisible = false
+
+	this.showUserSelector = function () {
+		this.userSelectorVisible = !this.userSelectorVisible
+	}
+
 	this.userId = 0
 	this.plans = []
 	this.userPlanId = 0