From 0cbf87ecb03a6ece6d9bcaa586a26ce8901ce116 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 30 Mar 2021 11:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/admins/admin.go       | 1 +
 internal/web/actions/default/admins/createPopup.go | 2 ++
 internal/web/actions/default/admins/index.go       | 1 +
 internal/web/actions/default/admins/update.go      | 3 +++
 web/views/@default/admins/admin.html               | 9 +++++++++
 web/views/@default/admins/createPopup.html         | 7 +++++++
 web/views/@default/admins/index.html               | 5 +++++
 web/views/@default/admins/update.html              | 7 +++++++
 8 files changed, 35 insertions(+)

diff --git a/internal/web/actions/default/admins/admin.go b/internal/web/actions/default/admins/admin.go
index ddb5334a..5cf5ad05 100644
--- a/internal/web/actions/default/admins/admin.go
+++ b/internal/web/actions/default/admins/admin.go
@@ -36,6 +36,7 @@ func (this *AdminAction) RunGet(params struct {
 		"username": admin.Username,
 		"isOn":     admin.IsOn,
 		"isSuper":  admin.IsSuper,
+		"canLogin": admin.CanLogin,
 	}
 
 	// 权限
diff --git a/internal/web/actions/default/admins/createPopup.go b/internal/web/actions/default/admins/createPopup.go
index fc1f0185..9eb42900 100644
--- a/internal/web/actions/default/admins/createPopup.go
+++ b/internal/web/actions/default/admins/createPopup.go
@@ -31,6 +31,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Pass2       string
 	ModuleCodes []string
 	IsSuper     bool
+	CanLogin    bool
 
 	// OTP
 	OtpOn bool
@@ -88,6 +89,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Fullname:    params.Fullname,
 		ModulesJSON: modulesJSON,
 		IsSuper:     params.IsSuper,
+		CanLogin:    params.CanLogin,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/internal/web/actions/default/admins/index.go b/internal/web/actions/default/admins/index.go
index 2f20c5fd..e9782da8 100644
--- a/internal/web/actions/default/admins/index.go
+++ b/internal/web/actions/default/admins/index.go
@@ -42,6 +42,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			"fullname":     admin.Fullname,
 			"createdTime":  timeutil.FormatTime("Y-m-d H:i:s", admin.CreatedAt),
 			"otpLoginIsOn": admin.OtpLogin != nil && admin.OtpLogin.IsOn,
+			"canLogin":     admin.CanLogin,
 		})
 	}
 	this.Data["admins"] = adminMaps
diff --git a/internal/web/actions/default/admins/update.go b/internal/web/actions/default/admins/update.go
index e5ec7580..0c58326d 100644
--- a/internal/web/actions/default/admins/update.go
+++ b/internal/web/actions/default/admins/update.go
@@ -45,6 +45,7 @@ func (this *UpdateAction) RunGet(params struct {
 		"username":     admin.Username,
 		"isOn":         admin.IsOn,
 		"isSuper":      admin.IsSuper,
+		"canLogin":     admin.CanLogin,
 		"otpLoginIsOn": otpLoginIsOn,
 	}
 
@@ -76,6 +77,7 @@ func (this *UpdateAction) RunPost(params struct {
 	ModuleCodes []string
 	IsOn        bool
 	IsSuper     bool
+	CanLogin    bool
 
 	// OTP
 	OtpOn bool
@@ -139,6 +141,7 @@ func (this *UpdateAction) RunPost(params struct {
 		ModulesJSON: modulesJSON,
 		IsSuper:     params.IsSuper,
 		IsOn:        params.IsOn,
+		CanLogin:    params.CanLogin,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/admins/admin.html b/web/views/@default/admins/admin.html
index 02df825e..05be04fb 100644
--- a/web/views/@default/admins/admin.html
+++ b/web/views/@default/admins/admin.html
@@ -20,6 +20,15 @@
             {{admin.username}}
         </td>
     </tr>
+    <tr>
+        <td>是否允许登录</td>
+        <td>
+            <span class="green" v-if="admin.canLogin">Y</span>
+            <span class="disabled" v-else>N</span>
+            <p class="comment" v-if="admin.canLogin">允许登录当前管理平台。</p>
+            <p class="comment" v-else="">不允许登录当前管理平台。</p>
+        </td>
+    </tr>
     <tr>
         <td>是否为超级管理员</td>
         <td>
diff --git a/web/views/@default/admins/createPopup.html b/web/views/@default/admins/createPopup.html
index 67f725ff..0fd951d8 100644
--- a/web/views/@default/admins/createPopup.html
+++ b/web/views/@default/admins/createPopup.html
@@ -32,6 +32,13 @@
 				<input type="password" name="pass2" maxlength="100"/>
 			</td>
 		</tr>
+        <tr>
+            <td>是否允许登录</td>
+            <td>
+                <checkbox name="canLogin" value="1"></checkbox>
+                <p class="comment">选中后才可以登录当前的管理平台。</p>
+            </td>
+        </tr>
 		<tr>
 			<td>是否为超级管理员</td>
 			<td>
diff --git a/web/views/@default/admins/index.html b/web/views/@default/admins/index.html
index 3d924f36..754cb07f 100644
--- a/web/views/@default/admins/index.html
+++ b/web/views/@default/admins/index.html
@@ -6,6 +6,7 @@
 		<tr>
 			<th>用户名</th>
 			<th>全名</th>
+            <th>允许登录</th>
             <th>OTP认证</th>
 			<th class="center width10">状态</th>
 			<th class="two op">操作</th>
@@ -18,6 +19,10 @@
 			</div>
 		</td>
 		<td :class="{disabled:!admin.isOn}">{{admin.fullname}}</td>
+        <td>
+            <span v-if="admin.canLogin" class="green">Y</span>
+            <span v-else class="disabled">N</span>
+        </td>
         <td>
             <span v-if="admin.otpLoginIsOn" class="green">Y</span>
             <span v-else class="disabled">N</span>
diff --git a/web/views/@default/admins/update.html b/web/views/@default/admins/update.html
index 96706661..02f49ffe 100644
--- a/web/views/@default/admins/update.html
+++ b/web/views/@default/admins/update.html
@@ -32,6 +32,13 @@
                 <input type="password" name="pass2" maxlength="100"/>
             </td>
         </tr>
+        <tr>
+            <td>是否允许登录</td>
+            <td>
+                <checkbox name="canLogin" value="1" v-model="admin.canLogin"></checkbox>
+                <p class="comment">选中后才可以登录当前的管理平台。</p>
+            </td>
+        </tr>
         <tr>
             <td>是否为超级管理员</td>
             <td>