From 7ce1c751aa0de114b90b4c1d9eb06014f0a3fd62 Mon Sep 17 00:00:00 2001
From: shy <shy@shylinux.com>
Date: Mon, 16 Dec 2024 15:17:20 +0800
Subject: [PATCH] add some

---
 src/dashboard/cleanup.go     | 24 +++++++++++++++++-------
 src/dashboard/model/model.go |  1 +
 src/dashboard/portal.go      | 14 --------------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/dashboard/cleanup.go b/src/dashboard/cleanup.go
index fd6cffe..67ec5ce 100644
--- a/src/dashboard/cleanup.go
+++ b/src/dashboard/cleanup.go
@@ -2,22 +2,32 @@ package dashboard
 
 import (
 	"shylinux.com/x/ice"
+	kit "shylinux.com/x/toolkits"
+
+	"shylinux.com/x/community/src/api"
+	"shylinux.com/x/operation/src/dashboard/model"
 )
 
 type cleanup struct {
 	Tables
-	portal Portal
-	order  string `data:"3"`
+	portal     Portal
+	order      string `data:"3"`
+	placeTrash string `name:"placeTrash" help:"清理"`
 }
 
 func (s cleanup) PlaceTrash(m *ice.Message, arg ...string) {
-	m.Cmdy(s.portal, s.portal.PlaceTrash)
-	m.DisplayTable()
+	m.Cmd("").Table(func(value ice.Maps) {
+		if value[model.AUTH_UID] != "" {
+			s.AutoCmd(m, api.RENZHENGSHOUQUAN_PORTAL, s.portal.PlaceTrash, kit.Dict(model.UID, value[model.AUTH_UID]))
+		}
+		s.AutoCmd(m, value[model.INDEX], s.portal.PlaceTrash, value)
+	})
 }
 func (s cleanup) List(m *ice.Message, arg ...string) {
-	m.Cmdy(s.portal, s.portal.PlaceCheck)
-	// m.Cmdy(s.Prefix(m, "service"))
-	// m.Cmdy("web.code.mysql.cleanup", "mysql").Action()
+	m.Cmd("service").Table(func(value ice.Maps) {
+		s.AutoCmdy(m, value[model.INDEX], s.portal.PlaceCheck)
+	})
+	m.Action(s.PlaceTrash)
 	m.DisplayTable()
 }
 
diff --git a/src/dashboard/model/model.go b/src/dashboard/model/model.go
index 26e5f0d..f10a6a9 100644
--- a/src/dashboard/model/model.go
+++ b/src/dashboard/model/model.go
@@ -28,6 +28,7 @@ const (
 	QUERY               = "query"
 	VALUE               = "value"
 	SCORE               = "score"
+	INDEX               = "index"
 )
 
 type UserDashboard struct {
diff --git a/src/dashboard/portal.go b/src/dashboard/portal.go
index 78f9354..ceb7d35 100644
--- a/src/dashboard/portal.go
+++ b/src/dashboard/portal.go
@@ -1,10 +1,6 @@
 package dashboard
 
 import (
-	"strings"
-
-	"shylinux.com/x/ice"
-
 	"shylinux.com/x/community/src/gonganxitong"
 	"shylinux.com/x/operation/src/operation"
 )
@@ -14,16 +10,6 @@ type Portal struct {
 	placeCreate string `name:"placeCreate city_name* company_name* dashboard_name* dashboard_type:select" role:"void"`
 }
 
-func (s Portal) PlaceTrash(m *ice.Message, arg ...string) {
-	s.Portal.PlaceTrash(m, arg...)
-	for key, _ := range m.Target().Commands {
-		if strings.HasPrefix(key, "_") {
-			continue
-		}
-		m.Push("command", key)
-	}
-}
-
 func init() {
 	gonganxitong.PortalCmd(Portal{Portal: operation.NewPortal(userDashboard{}, dashboard{})})
 }