diff --git a/base/web/dream.go b/base/web/dream.go index 3acc2211..3e04b61d 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -515,9 +515,9 @@ func init() { if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) || m.IsCliUA() { m.Action() } 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 { - 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.StatusTimeCountStats(mdb.TYPE, mdb.STATUS) diff --git a/core/chat/macos/desktop.go b/core/chat/macos/desktop.go index 20a2eb61..44710c82 100644 --- a/core/chat/macos/desktop.go +++ b/core/chat/macos/desktop.go @@ -32,7 +32,11 @@ func init() { DockAppend(m, "vimer.png", web.CODE_VIMER) } 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) }}, diff --git a/meta.go b/meta.go index 25d9b160..77ad890a 100644 --- a/meta.go +++ b/meta.go @@ -363,6 +363,11 @@ func (m *Message) Sort(key string, arg ...Any) *Message { return cmp == STR_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) { return cmp == INT } else if kit.Int(a) < kit.Int(b) {