diff --git a/base/cli/runtime.go b/base/cli/runtime.go index 6fcd8d9d..03eb9e5e 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -269,7 +269,7 @@ func init() { "conf": {Help: "配置", Hand: func(m *ice.Message, arg ...string) { OpenCmds(m, kit.Format("cd %s", kit.Path("")), "vim etc/init.shy") }}, - "lock": {Help: "锁屏", Hand: func(m *ice.Message, arg ...string) { + "lock": {Help: "锁屏", Icon: "bi bi-file-lock", Hand: func(m *ice.Message, arg ...string) { switch runtime.GOOS { case DARWIN: TellApp(m, "System Events", `keystroke "q" using {control down, command down}`) diff --git a/base/web/dream.go b/base/web/dream.go index 39f2af6b..a7bb63e9 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -208,32 +208,32 @@ func init() { _dream_start(m, m.Option(mdb.NAME)) } }}, - nfs.REPOS: {Help: "仓库", Hand: func(m *ice.Message, arg ...string) { + nfs.REPOS: {Help: "仓库", Icon: "bi bi-git", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.MergePodCmd("", CODE_GIT_SEARCH, nfs.REPOS, nfs.REPOS)) }}, - "startall": {Name: "startall name", Help: "启动", Hand: func(m *ice.Message, arg ...string) { + "startall": {Name: "startall name", Help: "启动", Icon: "bi bi-play-circle", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), cli.STOP, func(name string) { m.Cmd("", cli.START, ice.Maps{mdb.NAME: name, ice.MSG_DAEMON: ""}) }) }}, - "stopall": {Name: "stopall name", Help: "停止", Hand: func(m *ice.Message, arg ...string) { + "stopall": {Name: "stopall name", Help: "停止", Icon: "bi bi-stop-circle", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Cmd("", cli.STOP, ice.Maps{mdb.NAME: name, ice.MSG_DAEMON: ""}) }) }}, - "publish": {Name: "publish name", Help: "发布", Hand: func(m *ice.Message, arg ...string) { + "publish": {Name: "publish name", Help: "发布", Icon: "bi bi-send-check", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, "compile", cli.LINUX)) m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, "compile", cli.DARWIN)) m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, "compile", cli.WINDOWS)) }) }}, - ice.CMD: {Name: "cmd name cmd*", Help: "命令", Hand: func(m *ice.Message, arg ...string) { + ice.CMD: {Name: "cmd name cmd*", Help: "命令", Icon: "bi bi-terminal", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, kit.Split(m.Option(ice.CMD)))) }).StatusTimeCount(ice.CMD, m.Option(ice.CMD)) }}, - nfs.CAT: {Name: "cat name file*", Help: "文件", Hand: func(m *ice.Message, arg ...string) { + nfs.CAT: {Name: "cat name file*", Help: "文件", Icon: "bi bi-file-earmark-code", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, nfs.CAT, m.Option(nfs.FILE))) }).StatusTimeCount(nfs.FILE, m.Option(nfs.FILE)) diff --git a/base/web/route.go b/base/web/route.go index 28973aeb..b55c4eab 100644 --- a/base/web/route.go +++ b/base/web/route.go @@ -80,7 +80,7 @@ func init() { kit.For([]string{WORKER, SERVER}, func(key string) { push(kit.Format(":%s=", key)) }) } }}, - "spide": {Help: "导图", Hand: func(m *ice.Message, arg ...string) { + "spide": {Help: "导图", Icon: "bi bi-diagram-3", Hand: func(m *ice.Message, arg ...string) { ctx.DisplayStorySpide(m.Cmdy(""), nfs.DIR_ROOT, ice.Info.NodeName, mdb.FIELD, SPACE, lex.SPLIT, nfs.PT, ctx.ACTION, ice.MAIN) }}, ctx.CMDS: {Name: "cmds space index* args", Help: "命令", Hand: func(m *ice.Message, arg ...string) { @@ -100,7 +100,7 @@ func init() { m.Cmdy(ice.EXIT, "1") } }}, - "travel": {Help: "遍历", Hand: func(m *ice.Message, arg ...string) { + "travel": {Help: "遍历", Icon: "bi bi-card-list", Hand: func(m *ice.Message, arg ...string) { kit.For(kit.Split(m.OptionDefault(ice.MSG_FIELDS, mdb.Config(m, mdb.FIELD))), func(key string) { switch key { case mdb.TIME: diff --git a/core/chat/location/location.go b/core/chat/location/location.go index 4a25786d..f2875b98 100644 --- a/core/chat/location/location.go +++ b/core/chat/location/location.go @@ -29,6 +29,7 @@ func init() { LONGITUDE, "经度", LATITUDE, "纬度", PROVINCE, "省份", CITY, "城市", DISTRICT, "区域", STREET, "街路", )), ), Actions: ice.MergeActions(ice.Actions{ + "current": {Icon: "bi bi-pin-map"}, chat.FAVOR_INPUTS: {Hand: func(m *ice.Message, arg ...string) { kit.If(arg[0] == mdb.TYPE, func() { m.Push(arg[0], LOCATION) }) }}, diff --git a/misc/git/search.go b/misc/git/search.go index 8b18566a..7eda7c65 100644 --- a/misc/git/search.go +++ b/misc/git/search.go @@ -38,7 +38,7 @@ func init() { CLONE: {Name: "clone name*", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(REPOS, CLONE, m.Option(REPOS)) }}, HTML_URL: {Help: "源码", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.Option(HTML_URL)) }}, WEBSITE: {Help: "官网", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.Option(WEBSITE)) }}, - ORIGIN: {Help: "平台", Hand: func(m *ice.Message, arg ...string) { + ORIGIN: {Help: "平台", Icon: "bi bi-box-arrow-up-right", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(web.SpideOrigin(m, kit.Select(m.Option(REPOS), arg, 0)) + EXPLORE_REPOS) }}, web.DREAM_INPUTS: {Hand: func(m *ice.Message, arg ...string) { diff --git a/misc/git/status.go b/misc/git/status.go index 1fcbefb0..20aaa220 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -58,8 +58,8 @@ func init() { mdb.Config(m, aaa.USERNAME, m.Option(aaa.USERNAME)) mdb.Config(m, aaa.EMAIL, m.Option(aaa.EMAIL)) }}, - INSTEADOF: {Name: "insteadof remote", Help: "代理", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(REPOS, INSTEADOF, arg) }}, - OAUTH: {Help: "授权", Hand: func(m *ice.Message, arg ...string) { + INSTEADOF: {Name: "insteadof remote", Help: "代理", Icon: "bi bi-clouds", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(REPOS, INSTEADOF, arg) }}, + OAUTH: {Help: "授权", Icon: "bi bi-person-check", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(kit.MergeURL2(kit.Select(ice.Info.Make.Domain, m.Cmdx(REPOS, "remoteURL")), web.ChatCmdPath(m, web.TOKEN, "gen"), mdb.TYPE, "web.code.git.status", tcp.HOST, m.Option(ice.MSG_USERWEB))) }}, diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 255ef154..d7868b1a 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -63,12 +63,12 @@ type relay struct { field string `data:"time,machine,username,password,host,port,portal,module,version,commit,compile,boot,package,shell,kernel,arch,ncpu,vcpu,mhz,mem,disk,network,listen,socket,proc,vendor"` statsTables string `name:"statsTables" event:"stats.tables"` create string `name:"create machine* username* password host* port*=22 portal vendor"` - pubkey string `name:"pubkey" help:"公钥"` + pubkey string `name:"pubkey" help:"公钥" icon:"bi bi-person-vcard"` version string `name:"version" help:"版本"` - stats string `name:"stats machine" help:"采集"` - dream string `name:"dream" help:"空间"` - forEach string `name:"forEach machine cmd*:textarea=pwd" help:"遍历"` - forFlow string `name:"forFlow machine cmd*:textarea=pwd" help:"流程"` + stats string `name:"stats machine" help:"采集" icon:"bi bi-pc-display"` + dream string `name:"dream" help:"空间" icon:"bi bi-grid-3x3-gap"` + forEach string `name:"forEach machine cmd*:textarea=pwd" help:"遍历" icon:"bi bi-card-list"` + forFlow string `name:"forFlow machine cmd*:textarea=pwd" help:"流程" icon:"bi bi-terminal"` list string `name:"list machine auto" help:"代理" icon:"relay.png"` pushbin string `name:"pushbin" help:"部署"` adminCmd string `name:"adminCmd cmd" help:"命令"` diff --git a/misc/wx/ide.go b/misc/wx/ide.go index 1281f8b1..cf2d87aa 100644 --- a/misc/wx/ide.go +++ b/misc/wx/ide.go @@ -130,7 +130,7 @@ func init() { m.GoSleep3s(func() { web.PushNoticeGrow(m, ice.Render(m, ice.RENDER_IMAGES, web.SHARE_LOCAL+p)) }) IdeCli(m, "", _ide_args_cli(m), _ide_args_qrcode(m, p)).ProcessRefresh() }}, - code.AUTOGEN: {Name: "autogen projectname*='终端工具链' appid*='wxf4e5104d83476ed6' serve*='https://2021.shylinux.com'", Help: "生成", Hand: func(m *ice.Message, arg ...string) { + code.AUTOGEN: {Name: "autogen projectname*='终端工具链' appid*='wxf4e5104d83476ed6' serve*='https://2021.shylinux.com'", Help: "生成", Icon: "bi bi-tools", Hand: func(m *ice.Message, arg ...string) { _ide_autogen_utils(m) _ide_autogen_pages(m) p := ice.USR_PROGRAM diff --git a/misc/wx/ide.shy b/misc/wx/ide.shy new file mode 100644 index 00000000..93d6e902 --- /dev/null +++ b/misc/wx/ide.shy @@ -0,0 +1 @@ +title "ide"