diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index d9287745..7b6f4b86 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -295,7 +295,7 @@ func (s relay) Login(m *ice.Message, arg ...string) { )), func(res string) { m.ProcessHold() }) m.ProcessOpen(kit.MergeURL2(m.Option(mdb.LINK), web.C(web.CHAT_HEADER))) } else if m.Option(ice.MSG_METHOD) == http.MethodGet { - m.EchoInfoButton(kit.JoinLine(m.Trans("please confirm login", "请确认登录"), m.Option(ice.BACK)), m.ActionKey()) + m.EchoInfoButton("") } else { defer web.ToastProcess(m.Message)() ssh.CombinedOutput(m.Message, s.admins(m, kit.JoinCmds(web.SHARE, mdb.CREATE, mdb.TYPE, aaa.LOGIN, "--", mdb.TEXT, m.Option(ice.BACK))), func(res string) { diff --git a/render.go b/render.go index 60291fe6..cde03ce5 100644 --- a/render.go +++ b/render.go @@ -212,6 +212,8 @@ func (m *Message) EchoFields(cmd string, arg ...string) *Message { `, cmd, kit.Join(arg)) } func (m *Message) EchoInfoButton(info string, arg ...Any) *Message { + kit.If(info == "", func() { info = Info.Template(m, m.ActionKey()+".html") }) + kit.If(len(arg) == 0, func() { arg = append(arg, m.ActionKey()) }) m.Display("/plugin/table.js", "style", "form") return m.Echo(html.Format("div", info, "class", "info", "style", kit.JoinCSS())).EchoButton(arg...).Echo(NL).Action(arg...) }