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

add some

Browse Source
This commit is contained in:
shaoying 2020-06-02 17:19:27 +08:00
parent c9aa6d95fd
commit 1c9b74c2b9
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/web/route.go
View File

@ -71,7 +71,7 @@ func init() {
m.Push(kit.MDB_NAME, val[kit.MDB_NAME]) m.Push(kit.MDB_NAME, val[kit.MDB_NAME])
} }
}) })
if m.W != nil { if m.W != nil && len(arg) < 2 {
m.Table(func(index int, value map[string]string, field []string) { m.Table(func(index int, value map[string]string, field []string) {
m.Push("link", Format("a", kit.MergeURL(m.Option(ice.MSG_USERWEB), "pod", value["name"]), value["name"])) m.Push("link", Format("a", kit.MergeURL(m.Option(ice.MSG_USERWEB), "pod", value["name"]), value["name"]))
}) })

7
base/web/share.go
View File

@ -69,6 +69,12 @@ func _share_create(m *ice.Message, kind, name, text string, arg ...string) {
func _share_local(m *ice.Message, arg ...string) { func _share_local(m *ice.Message, arg ...string) {
p := path.Join(arg...) p := path.Join(arg...)
if m.Option("pod") != "" {
m.Cmdy(ice.WEB_SPACE, m.Option("pod"), "nfs.cat", p)
m.Render(ice.RENDER_RESULT)
return
}
switch ls := strings.Split(p, "/"); ls[0] { switch ls := strings.Split(p, "/"); ls[0] {
case "etc", "var": case "etc", "var":
return return
@ -109,6 +115,7 @@ func _share_action_redirect(m *ice.Message, value map[string]interface{}, share
"title", kit.Format(value["name"]), "title", kit.Format(value["name"]),
"river", kit.Value(value, "extra.river"), "river", kit.Value(value, "extra.river"),
"storm", kit.Value(value, "extra.storm"), "storm", kit.Value(value, "extra.storm"),
"pod", kit.Value(value, "extra.tool.0.pod"),
kit.UnMarshal(kit.Format(kit.Value(value, "extra.tool.0.value"))), kit.UnMarshal(kit.Format(kit.Value(value, "extra.tool.0.value"))),
) )
return true return true

20
core/chat/action.go
View File

@ -6,13 +6,18 @@ import (
) )
func _action_share_create(m *ice.Message, arg ...string) { func _action_share_create(m *ice.Message, arg ...string) {
m.Debug("info %v", arg)
if m.Option("index") != "" { if m.Option("index") != "" {
arg = append(arg, "tool.0.pod", m.Option("node")) m.Debug("info %v", arg)
arg = append(arg, "tool.0.ctx", m.Option("group")) m.Cmdy(ice.WEB_SHARE, ice.TYPE_ACTION, m.Option("name"), m.Option("text"),
arg = append(arg, "tool.0.cmd", m.Option("index")) "tool.0.pod", kit.Select(m.Option("pod"), m.Option("node")),
arg = append(arg, "tool.0.args", m.Option("args")) "tool.0.ctx", m.Option("group"),
arg = append(arg, "tool.0.value", m.Option("value")) "tool.0.cmd", m.Option("index"),
arg = append(arg, "tool.0.single", "yes") "tool.0.args", m.Option("args"),
"tool.0.value", m.Option("value"),
"tool.0.single", "yes",
)
return
} else { } else {
m.Option(ice.MSG_RIVER, arg[5]) m.Option(ice.MSG_RIVER, arg[5])
m.Option(ice.MSG_STORM, arg[7]) m.Option(ice.MSG_STORM, arg[7])
@ -23,7 +28,6 @@ func _action_share_create(m *ice.Message, arg ...string) {
arg = append(arg, kit.Format("tool.%d.args", index), value["args"]) arg = append(arg, kit.Format("tool.%d.args", index), value["args"])
}) })
} }
m.Cmdy(ice.WEB_SHARE, ice.TYPE_ACTION, m.Option("name"), arg[2], arg[3], arg[4:])
} }
func _action_share_select(m *ice.Message, c *ice.Context, cmd string, arg ...string) { func _action_share_select(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
m.Richs(ice.WEB_SHARE, nil, m.Option("share"), func(key string, value map[string]interface{}) { m.Richs(ice.WEB_SHARE, nil, m.Option("share"), func(key string, value map[string]interface{}) {
@ -52,7 +56,7 @@ func _action_share_update(m *ice.Message, c *ice.Context, cmd string, arg ...str
m.Richs(ice.WEB_SHARE, nil, m.Option("share"), func(key string, value map[string]interface{}) { m.Richs(ice.WEB_SHARE, nil, m.Option("share"), func(key string, value map[string]interface{}) {
kit.Fetch(kit.Value(value, kit.Keys("extra.tool", arg[2])), func(value map[string]interface{}) { kit.Fetch(kit.Value(value, kit.Keys("extra.tool", arg[2])), func(value map[string]interface{}) {
cmds := kit.Simple(m.Space(value["pod"]), kit.Keys(value["ctx"], value["cmd"]), arg[3:]) cmds := kit.Simple(kit.Keys(value["ctx"], value["cmd"]), arg[3:])
m.Cmdy(_action_proxy(m), cmds).Option("cmds", cmds) m.Cmdy(_action_proxy(m), cmds).Option("cmds", cmds)
}) })
}) })