From 982483dc3905174d26dc90a5a1058ab38799007f Mon Sep 17 00:00:00 2001 From: shylinux Date: Tue, 1 Feb 2022 13:59:55 +0800 Subject: [PATCH] opt some --- base/web/dream.go | 7 ++++--- core/chat/website.go | 11 +++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index a2c60ca6..5287931e 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -17,16 +17,17 @@ import ( func _dream_list(m *ice.Message) *ice.Message { return m.Cmdy(nfs.DIR, m.Config(nfs.PATH), "time,size,name").Table(func(index int, value map[string]string, head []string) { - if m.Richs(SPACE, nil, value[mdb.NAME], func(key string, value map[string]interface{}) { - m.Push(mdb.TYPE, value[mdb.TYPE]) + if m.Richs(SPACE, nil, value[mdb.NAME], func(key string, val map[string]interface{}) { + m.Push(mdb.TYPE, val[mdb.TYPE]) m.Push(cli.STATUS, cli.START) m.PushButton(cli.STOP) + m.PushAnchor(strings.Split(kit.MergePOD(m.Option(ice.MSG_USERWEB), value[mdb.NAME]), "?")[0]) }) == nil { m.Push(mdb.TYPE, WORKER) m.Push(cli.STATUS, cli.STOP) m.PushButton(cli.START) + m.PushAnchor("") } - m.Push(mdb.LINK, strings.Split(kit.MergePOD(m.Option(ice.MSG_USERWEB), value[mdb.NAME]), "?")[0]) }) } func _dream_show(m *ice.Message, name string) { diff --git a/core/chat/website.go b/core/chat/website.go index 7f08d348..e79956d1 100644 --- a/core/chat/website.go +++ b/core/chat/website.go @@ -144,7 +144,11 @@ func init() { }) }}, }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if mdb.HashSelect(m, arg...); len(arg) == 0 { + mdb.HashSelect(m, arg...).Table(func(index int, value map[string]string, head []string) { + m.PushAnchor(strings.Split(m.MergeURL2(value[nfs.PATH]), "?")[0]) + }) + + if len(arg) == 0 { dir := SRC_WEBSITE m.Cmd(nfs.DIR, dir, func(f os.FileInfo, p string) { m.Push("", kit.Dict( @@ -155,11 +159,10 @@ func init() { mdb.TEXT, m.Cmdx(nfs.CAT, p), ), kit.Split(m.Config(mdb.FIELD))) m.PushButton("") + m.PushAnchor(strings.Split(m.MergeURL2(path.Join(CHAT_WEBSITE, p)), "?")[0]) }) } - m.Table(func(index int, value map[string]string, head []string) { - m.PushAnchor(strings.Split(m.MergeURL2(value[nfs.PATH]), "?")[0]) - }) + if m.Length() == 0 && len(arg) > 0 { m.Push(mdb.TEXT, m.Cmdx(nfs.CAT, path.Join(SRC_WEBSITE, path.Join(arg...)))) m.Push(nfs.PATH, path.Join(CHAT_WEBSITE, path.Join(arg...)))