diff --git a/base/nfs/tail.go b/base/nfs/tail.go index 0fa45d0f..27fede71 100644 --- a/base/nfs/tail.go +++ b/base/nfs/tail.go @@ -50,7 +50,7 @@ func init() { m.Cmd(TAIL, mdb.CREATE, kit.MDB_FILE, kit.Format(value[kit.MDB_FILE]), kit.MDB_NAME, kit.Format(value[kit.MDB_NAME])) }) }}, - TAIL: {Name: "tail name id auto create page", Help: "日志流", Action: map[string]*ice.Action{ + TAIL: {Name: "tail name id auto page filter:text create", Help: "日志流", Action: map[string]*ice.Action{ mdb.CREATE: {Name: "create file name", Help: "创建", Hand: func(m *ice.Message, arg ...string) { _tail_create(m, arg...) }}, @@ -78,7 +78,7 @@ func init() { if len(arg) == 0 { m.PushAction(mdb.REMOVE) } else { - m.StatusTimeCount("total", m.Conf(TAIL, kit.Keys(kit.MDB_HASH, kit.Hashs(arg[0]), kit.MDB_META, kit.MDB_COUNT))) + m.StatusTimeCountTotal(m.Conf(TAIL, kit.Keys(kit.MDB_HASH, kit.Hashs(arg[0]), kit.MDB_META, kit.MDB_COUNT))) } }}, }, diff --git a/misc.go b/misc.go index 4fb4ecac..806c32b3 100644 --- a/misc.go +++ b/misc.go @@ -248,6 +248,7 @@ func (m *Message) SortTimeR(key string) { m.Sort(key, "time_r") } func (m *Message) FormatMeta() string { return m.Format("meta") } func (m *Message) FormatSize() string { return m.Format("size") } +func (m *Message) FormatCost() string { return m.Format("cost") } func (m *Message) RenameAppend(from, to string) { for i, v := range m.meta[MSG_APPEND] { if v == from { @@ -316,11 +317,12 @@ func (m *Message) Status(arg ...interface{}) { } m.Option(MSG_STATUS, kit.Format(list)) } + func (m *Message) StatusTimeCount(arg ...interface{}) { - m.Status(kit.MDB_TIME, m.Time(), kit.MDB_COUNT, m.FormatSize(), arg) + m.Status(kit.MDB_TIME, m.Time(), kit.MDB_COUNT, m.FormatSize(), arg, "cost", m.FormatCost()) } func (m *Message) StatusTimeCountTotal(arg ...interface{}) { - m.Status(kit.MDB_TIME, m.Time(), kit.MDB_COUNT, m.FormatSize(), "total", arg) + m.Status(kit.MDB_TIME, m.Time(), kit.MDB_COUNT, m.FormatSize(), "total", arg, "cost", m.FormatCost()) } func (m *Message) Process(action string, arg ...interface{}) { diff --git a/type.go b/type.go index 7d7e3712..88e08bb3 100644 --- a/type.go +++ b/type.go @@ -232,7 +232,6 @@ func (c *Context) _split(name string) []interface{} { if v == "page" { list = append(list, kit.List(kit.MDB_INPUT, "text", "name", "limit")...) list = append(list, kit.List(kit.MDB_INPUT, "text", "name", "offend")...) - list = append(list, kit.List(kit.MDB_INPUT, "text", "name", "filter")...) list = append(list, kit.List(kit.MDB_INPUT, "button", "name", "prev")...) list = append(list, kit.List(kit.MDB_INPUT, "button", "name", "next")...) continue