From a513970930d4c97efd5920b7f75ea6c95d18a9a9 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 26 Apr 2023 09:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=92=8C=E6=8C=89=E5=8D=A0=E7=94=A8=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F/=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/settings/database/clean.go        | 40 +++++++++++++++++--
 .../@default/settings/database/@menu.html     |  7 ++--
 .../@default/settings/database/clean.html     | 10 +++--
 web/views/@default/settings/database/clean.js |  4 ++
 .../@default/settings/database/update.html    | 10 ++---
 5 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/internal/web/actions/default/settings/database/clean.go b/internal/web/actions/default/settings/database/clean.go
index 281fa16b..e582dad3 100644
--- a/internal/web/actions/default/settings/database/clean.go
+++ b/internal/web/actions/default/settings/database/clean.go
@@ -6,6 +6,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"sort"
 )
 
 type CleanAction struct {
@@ -16,11 +17,20 @@ func (this *CleanAction) Init() {
 	this.Nav("", "", "clean")
 }
 
-func (this *CleanAction) RunGet(params struct{}) {
+func (this *CleanAction) RunGet(params struct {
+	OrderTable string
+	OrderSize  string
+}) {
+	this.Data["orderTable"] = params.OrderTable
+	this.Data["orderSize"] = params.OrderSize
+
 	this.Show()
 }
 
 func (this *CleanAction) RunPost(params struct {
+	OrderTable string
+	OrderSize  string
+
 	Must *actions.Must
 }) {
 	tablesResp, err := this.RPC().DBRPC().FindAllDBTables(this.AdminContext(), &pb.FindAllDBTablesRequest{})
@@ -28,9 +38,33 @@ func (this *CleanAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	var tables = tablesResp.DbTables
 
-	tableMaps := []maps.Map{}
-	for _, table := range tablesResp.DbTables {
+	// 排序
+	switch params.OrderTable {
+	case "asc":
+		sort.Slice(tables, func(i, j int) bool {
+			return tables[i].Name < tables[j].Name
+		})
+	case "desc":
+		sort.Slice(tables, func(i, j int) bool {
+			return tables[i].Name > tables[j].Name
+		})
+	}
+
+	switch params.OrderSize {
+	case "asc":
+		sort.Slice(tables, func(i, j int) bool {
+			return tables[i].DataLength+tables[i].IndexLength < tables[j].DataLength+tables[j].IndexLength
+		})
+	case "desc":
+		sort.Slice(tables, func(i, j int) bool {
+			return tables[i].DataLength+tables[i].IndexLength > tables[j].DataLength+tables[j].IndexLength
+		})
+	}
+
+	var tableMaps = []maps.Map{}
+	for _, table := range tables {
 		if !table.IsBaseTable || (!table.CanClean && !table.CanDelete) {
 			continue
 		}
diff --git a/web/views/@default/settings/database/@menu.html b/web/views/@default/settings/database/@menu.html
index 8057ba83..c2fb829f 100644
--- a/web/views/@default/settings/database/@menu.html
+++ b/web/views/@default/settings/database/@menu.html
@@ -1,9 +1,10 @@
 <first-menu>
-	<menu-item href="/settings/database" code="index">详情</menu-item>
-	<menu-item href="/settings/database/update" code="update">修改</menu-item>
+	<menu-item href="/settings/database" code="index">配置模板</menu-item>
+	<menu-item href="/settings/database/update" code="update">修改模板</menu-item>
+    <span class="item disabled">|</span>
     <menu-item href="/settings/database/clean" code="clean">手动清理</menu-item>
     <menu-item href="/settings/database/cleanSetting" code="cleanSetting">自动清理设置</menu-item>
-    <span class="item">|</span>
+    <span class="item disabled">|</span>
     <span class="item"><tip-icon content="在这里可以设置API节点可以使用的数据库，修改后请重新配置并启动API节点才能生效。"></tip-icon></span>
 </first-menu>
 <div class="margin"></div>
\ No newline at end of file
diff --git a/web/views/@default/settings/database/clean.html b/web/views/@default/settings/database/clean.html
index 2589c158..c03f863c 100644
--- a/web/views/@default/settings/database/clean.html
+++ b/web/views/@default/settings/database/clean.html
@@ -3,11 +3,15 @@
 
 <div class="ui message" v-if="isLoading">正在加载中...</div>
 
-<table class="ui table selectable">
+<div class="ui message small warning" v-if="tables.length > 0">
+    <p>请确认数据表用途后再执行相关操作。</p>
+</div>
+
+<table class="ui table selectable" v-if="tables.length > 0">
     <thead>
         <tr>
-            <th>表名</th>
-            <th>占用空间</th>
+            <th>数据表名<sort-arrow name="orderTable"></sort-arrow></th>
+            <th>占用空间<sort-arrow name="orderSize"></sort-arrow></th>
             <th>用途</th>
             <th class="two op">操作</th>
         </tr>
diff --git a/web/views/@default/settings/database/clean.js b/web/views/@default/settings/database/clean.js
index 7de0838e..df7282d8 100644
--- a/web/views/@default/settings/database/clean.js
+++ b/web/views/@default/settings/database/clean.js
@@ -9,6 +9,10 @@ Tea.context(function () {
     this.reload = function () {
         this.isLoading = true
         this.$post("$")
+			.params({
+				orderTable: this.orderTable,
+				orderSize: this.orderSize
+			})
             .success(function (resp) {
                 this.tables = resp.data.tables;
             })
diff --git a/web/views/@default/settings/database/update.html b/web/views/@default/settings/database/update.html
index 68bd7c73..818c22e0 100644
--- a/web/views/@default/settings/database/update.html
+++ b/web/views/@default/settings/database/update.html
@@ -1,6 +1,10 @@
 {$layout}
 {$template "menu"}
 
+<div class="ui message small warning">
+    <p>这里只能修改配置模板文件里的配置信息，并不能直接修改数据库的用户名、密码等信息。</p>
+</div>
+
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 	<table class="ui table selectable definition">
 		<tr>
@@ -37,8 +41,4 @@
 		</tr>
 	</table>
 	<submit-btn></submit-btn>
-</form>
-
-<div class="ui message small warning">
-	<p>修改数据库配置后需要重新配置API节点。</p>
-</div>
+</form>
\ No newline at end of file