From e2549d0f82b908adadefe02d5931cf59cdc8e5aa Mon Sep 17 00:00:00 2001
From: harveyshao <harveyshao@tencent.com>
Date: Thu, 3 Nov 2022 14:21:30 +0800
Subject: [PATCH] opt team

---
 core/code/css.go  |  8 ++++----
 core/team/plan.go |  2 +-
 logs.go           | 21 ++++++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/core/code/css.go b/core/code/css.go
index c975c995..3be4bb49 100644
--- a/core/code/css.go
+++ b/core/code/css.go
@@ -11,12 +11,12 @@ import (
 	kit "shylinux.com/x/toolkits"
 )
 
-func _css_stat(m *ice.Message, stats map[string]int) {
+func _css_stat(m *ice.Message, block string, stats map[string]int) {
 	msg := m.Spawn()
 	for k, v := range stats {
 		msg.Push("name", k)
 		msg.Push("value", v)
-		msg.Push("block", "stats")
+		msg.Push("block", block)
 	}
 	msg.SortIntR("value")
 	m.Copy(msg)
@@ -51,8 +51,8 @@ func _css_show(m *ice.Message, arg ...string) {
 		default:
 		}
 	})
-	_css_stat(m, stats_key)
-	_css_stat(m, stats_value)
+	_css_stat(m, "stats.key", stats_key)
+	_css_stat(m, "stats.value", stats_value)
 	m.StatusTimeCount()
 }
 func _css_exec(m *ice.Message, arg ...string) {
diff --git a/core/team/plan.go b/core/team/plan.go
index 541508dc..d3de153f 100644
--- a/core/team/plan.go
+++ b/core/team/plan.go
@@ -28,7 +28,7 @@ func _plan_scope(m *ice.Message, arg ...string) (begin_time, end_time time.Time)
 		begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1).AddDate(-5, 0, 0)
 		end_time = begin_time.AddDate(10, 0, 0)
 	}
-	m.Logs(mdb.SELECT, "begin_time", begin_time.Format(ice.MOD_TIME), "end_time", end_time.Format(ice.MOD_TIME))
+	m.Logs(mdb.SELECT, "begin_time", begin_time, "end_time", end_time)
 	return begin_time, end_time
 }
 func _plan_list(m *ice.Message, begin_time, end_time string) {
diff --git a/logs.go b/logs.go
index 3c99be99..7e2d37b1 100644
--- a/logs.go
+++ b/logs.go
@@ -23,17 +23,20 @@ func (m *Message) join(arg ...Any) (string, []Any) {
 			i--
 			continue
 		}
-		if key := strings.TrimSpace(kit.Format(arg[i])); i == len(arg)-1 {
+		key := strings.TrimSpace(kit.Format(arg[i]))
+		if i == len(arg)-1 {
 			list = append(list, key)
-		} else {
-			switch v := arg[i+1].(type) {
-			case logs.Meta:
-				list = append(list, key)
-				meta = append(meta, v)
-				continue
-			}
-			list = append(list, key+kit.Select("", DF, !strings.HasSuffix(key, DF)), kit.Format(kit.Select("", kit.Simple(arg[i+1]), 0)))
+			continue
 		}
+		switch v := arg[i+1].(type) {
+		case logs.Meta:
+			list = append(list, key)
+			meta = append(meta, v)
+			continue
+		case time.Time:
+			arg[i+1] = v.Format(MOD_TIME)
+		}
+		list = append(list, key+kit.Select("", DF, !strings.HasSuffix(key, DF)), kit.Format(kit.Select("", kit.Simple(arg[i+1]), 0)))
 	}
 	return kit.Join(list, SP), meta
 }