From 041aaa51c8a66455859edbec8b46af7ff52b07a6 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 5 Jan 2022 11:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BD=BF=E7=94=A8=E5=BE=85=E5=AE=A1=E6=A0=B8=E3=80=81?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/users/index.go | 18 +++++++++----
 web/views/@default/users/index.html         | 30 ++++++++++++++++++---
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/internal/web/actions/default/users/index.go b/internal/web/actions/default/users/index.go
index ce1bdcb1..f2981d90 100644
--- a/internal/web/actions/default/users/index.go
+++ b/internal/web/actions/default/users/index.go
@@ -16,9 +16,16 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	Keyword string
+	Keyword   string
+	Verifying bool
 }) {
-	countResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{Keyword: params.Keyword})
+	this.Data["keyword"] = params.Keyword
+	this.Data["isVerifying"] = params.Verifying
+
+	countResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{
+		Keyword:     params.Keyword,
+		IsVerifying: params.Verifying,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -28,9 +35,10 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{
-		Keyword: params.Keyword,
-		Offset:  page.Offset,
-		Size:    page.Size,
+		Keyword:     params.Keyword,
+		IsVerifying: params.Verifying,
+		Offset:      page.Offset,
+		Size:        page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/users/index.html b/web/views/@default/users/index.html
index e6620e1e..7dc2a14a 100644
--- a/web/views/@default/users/index.html
+++ b/web/views/@default/users/index.html
@@ -1,9 +1,27 @@
 {$layout}
 
 <first-menu>
-	<menu-item @click.prevent="createUser">创建</menu-item>
+    <menu-item href="/users" :active="!isVerifying">全部用户</menu-item>
+    <menu-item href="/users?verifying=1" :active="isVerifying" v-if="teaIsPlus">待审核</menu-item>
+    <span class="item disabled">|</span>
+	<menu-item @click.prevent="createUser">[创建用户]</menu-item>
 </first-menu>
 
+<div class="margin"></div>
+<form class="ui form" action="/users" method="get">
+    <input type="hidden" name="verifying" :value="isVerifying ? 1 : 0"/>
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" placeholder="用户名、全名、手机号..." name="keyword" v-model="keyword"/>
+        </div>
+        <div class="ui field">
+            <button type="submit" class="ui button">搜索</button>
+            &nbsp;
+            <a :href="'/users?verifying=' + (isVerifying ? 1 : 0)" v-if="keyword.length > 0">[清除条件]</a>
+        </div>
+    </div>
+</form>
+
 <p class="comment" v-if="users.length == 0">暂时还没有用户。</p>
 <table class="ui table selectable" v-if="users.length > 0">
 	<thead>
@@ -19,7 +37,9 @@
 	</thead>
 	<tr v-for="user in users">
         <td :class="{disabled:!user.isOn}">
-            <a :href="'/users/user?userId=' + user.id">{{user.username}}</a>
+            <a :href="'/users/user?userId=' + user.id">
+                <keyword :v-word="keyword">{{user.username}}</keyword>
+            </a>
             <div v-if="!user.isVerified">
                 <grey-label color="red">未审核</grey-label>
             </div>
@@ -27,13 +47,15 @@
                 <grey-label color="red">已拒绝</grey-label>
             </div>
         </td>
-        <td :class="{disabled:!user.isOn}">{{user.fullname}}</td>
+        <td :class="{disabled:!user.isOn}">
+            <keyword :v-word="keyword">{{user.fullname}}</keyword>
+        </td>
         <td>
             <span v-if="user.cluster != null">{{user.cluster.name}} <link-icon :href="'/clusters/cluster?clusterId=' + user.cluster.id"></link-icon></span>
             <span v-else class="disabled">-</span>
         </td>
         <td :class="{disabled:!user.isOn}">
-            <span v-if="user.mobile.length > 0">{{user.mobile}}</span>
+            <span v-if="user.mobile.length > 0"><keyword :v-word="keyword">{{user.mobile}}</keyword></span>
             <span v-else class="disabled">-</span>
         </td>
         <td :class="{disabled:!user.isOn}">{{user.createdTime}}</td>