diff --git a/base/web/matrix.go b/base/web/matrix.go index f5506880..65243646 100644 --- a/base/web/matrix.go +++ b/base/web/matrix.go @@ -136,7 +136,7 @@ func init() { return value }) m.Action(html.FILTER, mdb.CREATE).StatusTimeCountStats(mdb.TYPE, mdb.STATUS).Display("") - m.Sort("type,status,name,domain", []string{WORKER, MYSELF, SERVER, MASTER, ""}, []string{cli.START, cli.STOP, ""}, "str_r", "str_r") + m.Sort("type,status,name,domain", []string{MYSELF, SERVER, MASTER, WORKER, ""}, []string{cli.START, cli.STOP, ""}, "str_r", "str_r") return nil }) ctx.Toolkit(m) diff --git a/base/web/share.go b/base/web/share.go index 665a1aa7..62b07d4a 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -168,7 +168,7 @@ func ShareLocalFile(m *ice.Message, arg ...string) { } if m.Option(ice.POD) == "" || (strings.HasPrefix(p, ice.USR_ICONS) && nfs.Exists(m, p)) { m.RenderDownload(p) - } else if pp := kit.Path(ice.USR_LOCAL_WORK, m.Option(ice.POD), p); nfs.Exists(m, pp) { + } else if pp := kit.Path(ice.USR_LOCAL_WORK, kit.Select("", kit.Split(m.Option(ice.POD), nfs.PT), -1), p); nfs.Exists(m, pp) { m.RenderDownload(pp) } else if pp := kit.Path(ice.USR_LOCAL_WORK, m.Option(ice.POD)); nfs.Exists(m, pp) { m.RenderDownload(p) diff --git a/base/web/space.go b/base/web/space.go index e948bbca..64a5cfb7 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -185,7 +185,7 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc kit.If(m.Option(ice.MSG_DAEMON), func(p string) { m.Option(ice.MSG_DAEMON, kit.Keys(kit.Slice(kit.Reverse(kit.Simple(source)), 0, -1), p)) }) - m.Option(ice.FROM_SPACE, kit.Keys(kit.Reverse(source[1:]))) + m.Option(ice.FROM_SPACE, kit.Keys(kit.Reverse(kit.Simple(source[1:])))) kit.If(aaa.Right(m, m.Detailv()), func() { m.TryCatch(true, func(_ *ice.Message) { m = m.Cmd() }) }) kit.If(m.Optionv(ice.MSG_ARGS) != nil, func() { m.Options(ice.MSG_ARGS, kit.Simple(m.Optionv(ice.MSG_ARGS))) }) }