From cbd444eb77f46fa226c9f1ddf8f50f145dcea3a9 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 3 Dec 2020 19:25:36 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7]=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=88=9B=E5=BB=BA=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/admins/createPopup.go | 5 ++---
 internal/web/actions/default/admins/updatePopup.go | 4 +++-
 web/views/@default/admins/createPopup.html         | 7 +++++++
 web/views/@default/admins/createPopup.js           | 3 +++
 web/views/@default/admins/index.html               | 2 +-
 web/views/@default/admins/updatePopup.html         | 7 +++++++
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 web/views/@default/admins/createPopup.js

diff --git a/internal/web/actions/default/admins/createPopup.go b/internal/web/actions/default/admins/createPopup.go
index b12acab1..075c6ed7 100644
--- a/internal/web/actions/default/admins/createPopup.go
+++ b/internal/web/actions/default/admins/createPopup.go
@@ -28,6 +28,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Pass1       string
 	Pass2       string
 	ModuleCodes []string
+	IsSuper     bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -81,15 +82,13 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Password:    params.Pass1,
 		Fullname:    params.Fullname,
 		ModulesJSON: modulesJSON,
-		IsSuper:     false, // TODO 后期再开放创建超级用户
+		IsSuper:     params.IsSuper,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-
-
 	defer this.CreateLogInfo("创建系统用户 %d", createResp.AdminId)
 
 	// 通知更改
diff --git a/internal/web/actions/default/admins/updatePopup.go b/internal/web/actions/default/admins/updatePopup.go
index 16812ede..384f0c28 100644
--- a/internal/web/actions/default/admins/updatePopup.go
+++ b/internal/web/actions/default/admins/updatePopup.go
@@ -34,6 +34,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		"fullname": admin.Fullname,
 		"username": admin.Username,
 		"isOn":     admin.IsOn,
+		"isSuper":  admin.IsSuper,
 	}
 
 	moduleMaps := configloaders.AllModuleMaps()
@@ -62,6 +63,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Pass2       string
 	ModuleCodes []string
 	IsOn        bool
+	IsSuper     bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -120,7 +122,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Password:    params.Pass1,
 		Fullname:    params.Fullname,
 		ModulesJSON: modulesJSON,
-		IsSuper:     false, // TODO 后期再开放创建超级用户
+		IsSuper:     params.IsSuper,
 		IsOn:        params.IsOn,
 	})
 	if err != nil {
diff --git a/web/views/@default/admins/createPopup.html b/web/views/@default/admins/createPopup.html
index 2fcf161a..f16c2d8c 100644
--- a/web/views/@default/admins/createPopup.html
+++ b/web/views/@default/admins/createPopup.html
@@ -33,6 +33,13 @@
 			</td>
 		</tr>
 		<tr>
+			<td>是否为超级管理员</td>
+			<td>
+				<checkbox name="isSuper" v-model="isSuper"></checkbox>
+				<p class="comment">超级管理员自动拥有所有的管理权限。</p>
+			</td>
+		</tr>
+		<tr v-show="!isSuper">
 			<td>权限</td>
 			<td>
 				<div class="modules-box">
diff --git a/web/views/@default/admins/createPopup.js b/web/views/@default/admins/createPopup.js
new file mode 100644
index 00000000..e6c96b1d
--- /dev/null
+++ b/web/views/@default/admins/createPopup.js
@@ -0,0 +1,3 @@
+Tea.context(function () {
+	this.isSuper = false
+})
\ No newline at end of file
diff --git a/web/views/@default/admins/index.html b/web/views/@default/admins/index.html
index d0acbb40..c8f96d8a 100644
--- a/web/views/@default/admins/index.html
+++ b/web/views/@default/admins/index.html
@@ -23,7 +23,7 @@
 			<label-on :v-is-on="admin.isOn"></label-on>
 		</td>
 		<td>
-			<a href="" @click.prevent="updateAdmin(admin.id)" v-if="!admin.isSuper">修改</a> &nbsp; <a href="" v-if="!admin.isSuper" @click.prevent="deleteAdmin(admin.id)">删除</a>
+			<a href="" @click.prevent="updateAdmin(admin.id)">修改</a> &nbsp; <a href="" @click.prevent="deleteAdmin(admin.id)">删除</a>
 		</td>
 	</tr>
 </table>
diff --git a/web/views/@default/admins/updatePopup.html b/web/views/@default/admins/updatePopup.html
index 66061b71..a7af12c0 100644
--- a/web/views/@default/admins/updatePopup.html
+++ b/web/views/@default/admins/updatePopup.html
@@ -36,6 +36,13 @@
 			</td>
 		</tr>
 		<tr>
+			<td>是否为超级管理员</td>
+			<td>
+				<checkbox name="isSuper" v-model="admin.isSuper"></checkbox>
+				<p class="comment">超级管理员自动拥有所有的管理权限。</p>
+			</td>
+		</tr>
+		<tr v-show="!admin.isSuper">
 			<td>权限</td>
 			<td>
 				<div class="modules-box">