liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-06-09 22:58:23 +08:00
parent 95ba9fc6cd
commit bc6e12a6f0
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
base/web/space.go
View File

@ -84,9 +84,6 @@ func _space_fork(m *ice.Message) {
safe = aaa.IsTechOrRoot(m) safe = aaa.IsTechOrRoot(m)
} }
} }
if m.Option(mdb.ICONS) != "" && !kit.HasPrefix(m.Option(mdb.ICONS), nfs.PS, HTTP) {
// m.Option(mdb.ICONS, kit.MergeURL(nfs.P+m.Option(mdb.ICONS), ice.POD, name))
}
args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON)) args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON))
args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE))
args = append(args, cli.SYSTEM, m.Option(cli.GOOS)) args = append(args, cli.SYSTEM, m.Option(cli.GOOS))
@ -194,14 +191,6 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc
m.Optionv(ice.MSG_OPTION, []string{}) m.Optionv(ice.MSG_OPTION, []string{})
break break
} }
icons := m.Option(mdb.ICONS)
if !strings.HasPrefix(icons, HTTP) {
if !strings.HasPrefix(icons, nfs.PS) {
icons = nfs.P + icons
}
icons = SpideOrigin(m, name) + icons
}
m.Option(mdb.ICONS, icons)
args := m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM) args := m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM)
kit.If(name == ice.OPS, func() { args = append(args, m.OptionSimple(mdb.TEXT)...) }) kit.If(name == ice.OPS, func() { args = append(args, m.OptionSimple(mdb.TEXT)...) })
mdb.HashModify(m, mdb.HASH, name, ParseUA(m), args) mdb.HashModify(m, mdb.HASH, name, ParseUA(m), args)
@ -338,7 +327,7 @@ func init() {
m.Cmd(SERVE, m.ActionKey(), arg) m.Cmd(SERVE, m.ActionKey(), arg)
return return
} }
m.Option(mdb.ICONS, "") m.Options(mdb.ICONS, "")
kit.If(ice.Info.NodeMain, func(cmd string) { RenderPodCmd(m, "", cmd) }, func() { RenderMain(m) }) kit.If(ice.Info.NodeMain, func(cmd string) { RenderPodCmd(m, "", cmd) }, func() { RenderMain(m) })
}}, }},
ice.INFO: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { ice.INFO: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) {
@ -430,11 +419,18 @@ func init() {
m.PushButton(kit.Select(OPEN, LOGIN, value[mdb.TYPE] == LOGIN), mdb.REMOVE) m.PushButton(kit.Select(OPEN, LOGIN, value[mdb.TYPE] == LOGIN), mdb.REMOVE)
}) })
m.RewriteAppend(func(value, key string, index int) string { m.RewriteAppend(func(value, key string, index int) string {
if key == mdb.ICONS { if key == mdb.ICONS && !kit.HasPrefix(value, HTTP) {
if !kit.HasPrefix(value, nfs.PS, HTTP) { if m.Appendv(mdb.TYPE)[index] == ORIGIN {
if !kit.HasPrefix(value, nfs.PS) {
value = kit.MergeURL(nfs.P + value)
}
value = kit.MergeURL2(m.Appendv(mdb.TEXT)[index], value)
} else {
if !kit.HasPrefix(value, nfs.PS) {
value = kit.MergeURL(nfs.P+value, ice.POD, kit.Keys(m.Option(ice.MSG_USERPOD), m.Appendv(mdb.NAME)[index])) value = kit.MergeURL(nfs.P+value, ice.POD, kit.Keys(m.Option(ice.MSG_USERPOD), m.Appendv(mdb.NAME)[index]))
} }
} }
}
return value return value
}) })
m.Sort("", kit.Simple(aaa.LOGIN, WEIXIN, PORTAL, WORKER, SERVER, ORIGIN)) m.Sort("", kit.Simple(aaa.LOGIN, WEIXIN, PORTAL, WORKER, SERVER, ORIGIN))

1
core/chat/pod.go
View File

@ -50,6 +50,7 @@ func init() {
m.Cmdy(web.SPACE, arg[0], arg[2], arg[3:]) m.Cmdy(web.SPACE, arg[0], arg[2], arg[3:])
} else { } else {
m.Options(m.Cmd(web.SPACE, arg[0]).AppendSimple()) m.Options(m.Cmd(web.SPACE, arg[0]).AppendSimple())
m.Options(mdb.ICONS, "")
web.RenderPodCmd(m, arg[0], arg[2], arg[3:]) web.RenderPodCmd(m, arg[0], arg[2], arg[3:])
} }
} }

2
init.go
View File

@ -126,7 +126,7 @@ func Run(arg ...string) string {
conf.Wait() conf.Wait()
os.Exit(kit.Int(Pulse.Option(EXIT))) os.Exit(kit.Int(Pulse.Option(EXIT)))
default: default:
_forever = true _forever = false
Pulse.Cmdy(INIT).Cmdy(arg) Pulse.Cmdy(INIT).Cmdy(arg)
kit.If(strings.TrimSpace(Pulse.Result()) == "" && Pulse.Length() > 0, func() { Pulse.TableEcho() }) kit.If(strings.TrimSpace(Pulse.Result()) == "" && Pulse.Length() > 0, func() { Pulse.TableEcho() })
kit.If(Pulse.Result() != "" && !strings.HasSuffix(Pulse.Result(), NL), func() { Pulse.Echo(NL) }) kit.If(Pulse.Result() != "" && !strings.HasSuffix(Pulse.Result(), NL), func() { Pulse.Echo(NL) })

5
misc/wx/ide.go
View File

@ -155,9 +155,8 @@ func init() {
cli.MAKE: {Help: "构建", Icon: "bi bi-tools", Hand: func(m *ice.Message, arg ...string) { cli.MAKE: {Help: "构建", Icon: "bi bi-tools", Hand: func(m *ice.Message, arg ...string) {
kit.If(m.Option(mdb.HASH), func(p string) { mdb.Config(m, CURRENT, p) }) kit.If(m.Option(mdb.HASH), func(p string) { mdb.Config(m, CURRENT, p) })
m.Options(m.Cmd("", kit.Select(mdb.Config(m, CURRENT), arg, 0)).AppendSimple()) m.Options(m.Cmd("", kit.Select(mdb.Config(m, CURRENT), arg, 0)).AppendSimple())
kit.If(m.Option(cli.PWD), func(p string) { // _ide_autogen_utils(m)
// kit.If(p == kit.Path(ice.USR_VOLCANOS+PUBLISH_CLIENT_MP), func() { _ide_autogen_utils(m); _ide_autogen_pages(m) }) // _ide_autogen_pages(m)
})
m.Cmd("", AUTO_PREVIEW) m.Cmd("", AUTO_PREVIEW)
}}, }},
web.ADMIN: {Hand: func(m *ice.Message, arg ...string) { web.ADMIN: {Hand: func(m *ice.Message, arg ...string) {