1
0
forked from x/icebergs
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-05-11 18:21:13 +08:00
parent bcbfb9aaed
commit 8b0e3ebe55
3 changed files with 12 additions and 3 deletions

View File

@ -515,9 +515,9 @@ func init() {
if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) || m.IsCliUA() { if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) || m.IsCliUA() {
m.Action() m.Action()
} else if m.IsDebug() && cli.SystemFindGo(m) { } else if m.IsDebug() && cli.SystemFindGo(m) {
m.Action(html.FILTER, mdb.CREATE, STARTALL, STOPALL, cli.BUILD, PUBLISH) m.Action(mdb.CREATE, STARTALL, STOPALL, cli.BUILD, PUBLISH)
} else { } else {
m.Action(html.FILTER, mdb.CREATE, STARTALL, STOPALL) m.Action(mdb.CREATE, STARTALL, STOPALL)
} }
m.Sort("type,status,name", []string{aaa.LOGIN, WORKER, SERVER, ORIGIN}, []string{cli.START, cli.STOP, cli.BEGIN}, ice.STR_R) m.Sort("type,status,name", []string{aaa.LOGIN, WORKER, SERVER, ORIGIN}, []string{cli.START, cli.STOP, cli.BEGIN}, ice.STR_R)
m.StatusTimeCountStats(mdb.TYPE, mdb.STATUS) m.StatusTimeCountStats(mdb.TYPE, mdb.STATUS)

View File

@ -32,7 +32,11 @@ func init() {
DockAppend(m, "vimer.png", web.CODE_VIMER) DockAppend(m, "vimer.png", web.CODE_VIMER)
} }
m.Travel(func(p *ice.Context, c *ice.Context, key string, cmd *ice.Command) { m.Travel(func(p *ice.Context, c *ice.Context, key string, cmd *ice.Command) {
kit.If(cmd.Icon, func() { cmd.Icon = AppInstall(m, cmd.Icon, m.PrefixKey()) }) kit.If(cmd.Icon, func() {
if kit.Contains(cmd.Icon, ".ico", ".png", ".jpg") {
cmd.Icon = AppInstall(m, cmd.Icon, m.PrefixKey())
}
})
}) })
Notify(m, "usr/icons/Infomation.png", cli.RUNTIME, "系统启动成功", ctx.INDEX, cli.RUNTIME) Notify(m, "usr/icons/Infomation.png", cli.RUNTIME, "系统启动成功", ctx.INDEX, cli.RUNTIME)
}}, }},

View File

@ -363,6 +363,11 @@ func (m *Message) Sort(key string, arg ...Any) *Message {
return cmp == STR_R return cmp == STR_R
} }
case INT, INT_R: case INT, INT_R:
if a == "" && b != "" {
return cmp == INT
} else if a != "" && b == "" {
return cmp == INT_R
}
if kit.Int(a) > kit.Int(b) { if kit.Int(a) > kit.Int(b) {
return cmp == INT return cmp == INT
} else if kit.Int(a) < kit.Int(b) { } else if kit.Int(a) < kit.Int(b) {