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 @@
| 表名 | -占用空间 | +数据表名 |
+ 占用空间 |
用途 | 操作 |
|---|