From a33bc88dccc0dc3a310db3405b05b6457d5693ee Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Feb 2025 21:00:50 +0800 Subject: [PATCH] add some --- base/web/dream.go | 23 ++++++++++------------- misc/ssh/relay/relay.go | 17 ++++++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index a53e4e6d..81ec0f23 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -89,25 +89,22 @@ func _dream_list_more(m *ice.Message, simple bool) *ice.Message { value[nfs.REPOS] = "https://" + value[nfs.MODULE] value[aaa.ACCESS] = kit.Select("", value[aaa.USERROLE], value[aaa.USERROLE] != aaa.VOID) value[mdb.STATUS] = cli.START - button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, DREAM, OPEN} + button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, VIMER, STATUS, COMPILE, cli.RUNTIME, XTERM, OPEN} switch value[mdb.TYPE] { + case ORIGIN: + if value[aaa.ACCESS] == "" { + defer m.PushButton(PORTAL, OPEN) + break + } + fallthrough case SERVER: value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) if simple { defer m.PushButton(button...) } else { - msg := gdb.Event(m.Spawn(value), DREAM_TABLES) - defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) - } - case ORIGIN: - value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) - if simple { defer m.PushButton(button...) - } else if value[aaa.ACCESS] == "" { - defer m.PushButton(PORTAL) - } else { - msg := gdb.Event(m.Spawn(value), DREAM_TABLES) - defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) + // msg := gdb.Event(m.Spawn(value), DREAM_TABLES) + // defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) } case aaa.LOGIN: value[mdb.TEXT] = kit.JoinWord(value[AGENT], value[cli.SYSTEM], value[aaa.IP], kit.Format(PublicIP(m, value[aaa.IP]))) @@ -541,7 +538,7 @@ func init() { }}, }, StatsAction(), DreamAction(), DreamTablesAction(), mdb.ImportantHashAction( mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,main,icons,repos,binary,template,restart,access", - html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, STATUS, VIMER, COMPILE, XTERM, DREAM), + html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, VIMER, STATUS, COMPILE, XTERM, DREAM), ONLINE, ice.TRUE, )), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 22b3b4f0..e69e1f38 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -228,18 +228,21 @@ func (s relay) List(m *ice.Message, arg ...string) *ice.Message { stats[DISK_TOTAL] += kit.Int(ls[1]) } if value[web.PORTAL] == "" { - m.Push(web.LINK, "").PushButton(s.Xterm, s.Pushbin, s.Install, s.Remove) + m.Push(web.LINK, "").PushButton(s.Xterm, + // s.Pushbin, s.Install, + s.Remove) } else { m.Push(web.LINK, m.HostPort(value[tcp.HOST], value[web.PORTAL])) m.PushButton(s.Portal, s.Desktop, s.Admin, s.Open, - s.Status, s.Vimer, s.Login, + // s.Status, s.Vimer, + s.Login, s.Spide, - s.AdminCmd, - s.Upgrade, - s.Pushbin, - s.Pushkey, + // s.AdminCmd, + // s.Upgrade, + // s.Pushbin, + // s.Pushkey, s.Xterm, - s.SetIcon, + // s.SetIcon, s.Remove) kit.If(len(arg) > 0, func() { m.PushQRCode(cli.QRCODE, m.Append(web.LINK)) }) }