diff --git a/base/lex/matrix.go b/base/lex/matrix.go index 5ce8f23d..e3eaa33e 100644 --- a/base/lex/matrix.go +++ b/base/lex/matrix.go @@ -440,7 +440,66 @@ func init() { }) m.ProcessInner() }}, + "location": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessLocation("https://baidu.com") + }}, + "replace": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessReplace("https://baidu.com") + }}, + "history": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessHistory() + }}, + "confirms": {Hand: func(m *ice.Message, arg ...string) { + m.Option("hi", "hello") + m.ProcessConfirm("hello world") + }}, + "refresh": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessRefresh("3s") + }}, + "rewrite": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessRewrite("hash", "1", "npage", "2") + }}, + "display": {Hand: func(m *ice.Message, arg ...string) { + m.Push("value", 1) + m.Push("value", 2) + m.ProcessDisplay("/plugin/story/pie.js") + }}, + "field": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessCommand("cli.system", []string{"pwd"}, arg...) + }}, + "inner": {Hand: func(m *ice.Message, arg ...string) { + m.Push("value", 1) + m.Push("value", 2) + m.Push("good", 2) + m.Push("good", 2) + m.ProcessInner() + }}, + "hold": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessHold() + }}, + "back": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessBack() + }}, + "rich": {Hand: func(m *ice.Message, arg ...string) { + m.Push("hi", "hello") + m.Push("he", "world") + m.Push("value", "good") + m.ProcessRich("hello world\n") + }}, + "grow": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessGrow("hello world\n") + }}, + "open": {Hand: func(m *ice.Message, arg ...string) { + m.ProcessOpen("https://baidu.com") + }}, }, Hand: func(m *ice.Message, arg ...string) { + m.Action("location", "replace", "history", "confirms", "rewrite", "refresh", "display", "field", "inner", "hold", "back", "rich", "grow", "open") + m.Push("hi", "hello") + m.Push("he", "world") + m.Push("value", "good") + m.Echo("hello world") + m.StatusTimeCount() + return if m.Action(mdb.CREATE); len(arg) == 0 { // 矩阵列表 m.Fields(len(arg), "time,hash,npage,nhash") m.Cmdy(mdb.SELECT, m.PrefixKey(), "", mdb.HASH) diff --git a/base/web/render.go b/base/web/render.go index 93d05409..1462cede 100644 --- a/base/web/render.go +++ b/base/web/render.go @@ -62,7 +62,7 @@ func Render(msg *ice.Message, cmd string, args ...ice.Any) { fallthrough default: for _, k := range []string{ - "_option", "_handle", "_output", "", + "_", "_option", "_handle", "_output", "", "cmds", "fields", "sessid", "domain", "river", "storm", } { diff --git a/conf.go b/conf.go index 7dce9c3b..a5d6cc49 100644 --- a/conf.go +++ b/conf.go @@ -227,6 +227,7 @@ const ( // PROCESS PROCESS_LOCATION = "_location" PROCESS_REPLACE = "_replace" PROCESS_HISTORY = "_history" + PROCESS_CONFIRM = "_confirm" PROCESS_REFRESH = "_refresh" PROCESS_REWRITE = "_rewrite" PROCESS_DISPLAY = "_display" @@ -234,10 +235,12 @@ const ( // PROCESS PROCESS_INNER = "_inner" PROCESS_AGAIN = "_again" - PROCESS_OPEN = "_open" PROCESS_HOLD = "_hold" PROCESS_BACK = "_back" + PROCESS_RICH = "_rich" PROCESS_GROW = "_grow" + PROCESS_OPEN = "_open" + PROCESS_ARG = "_arg" FIELD_PREFIX = "_prefix" ) diff --git a/core/code/webpack.go b/core/code/webpack.go index 7ba46a8f..075ddcdc 100644 --- a/core/code/webpack.go +++ b/core/code/webpack.go @@ -73,11 +73,11 @@ func _webpack_cache(m *ice.Message, dir string, write bool) { } }) } - for _, k := range []string{PUBLISH_ORDER_JS, ice.FRAME_JS} { + for _, k := range []string{ice.FRAME_JS} { fmt.Fprintln(js, `_can_name = "`+path.Join(ice.PS, k)+`"`) fmt.Fprintln(js, m.Cmdx(nfs.CAT, k)) } - + fmt.Fprintln(js, `_can_name = ""`) } func _webpack_build(m *ice.Message, file string) { if f, _, e := kit.Create(kit.Keys(file, JS)); m.Assert(e) { diff --git a/option.go b/option.go index 042cecb9..1310f1c9 100644 --- a/option.go +++ b/option.go @@ -217,7 +217,7 @@ func (m *Message) GoToast(title string, cb func(toast func(string, int, int))) { func (m *Message) Process(action string, arg ...Any) { m.Option(MSG_PROCESS, action) - m.Option("_arg", arg...) + m.Option(PROCESS_ARG, arg...) } func (m *Message) ProcessLocation(arg ...Any) { m.Process(PROCESS_LOCATION, arg...) @@ -228,8 +228,8 @@ func (m *Message) ProcessReplace(url string, arg ...Any) { func (m *Message) ProcessHistory(arg ...Any) { m.Process(PROCESS_HISTORY, arg...) } -func (m *Message) ProcessRewrite(arg ...Any) { - m.Process(PROCESS_REWRITE, arg...) +func (m *Message) ProcessConfirm(arg ...Any) { + m.Process(PROCESS_CONFIRM, arg...) } func (m *Message) ProcessRefresh(delay string) { if d, e := time.ParseDuration(delay); e == nil { @@ -241,6 +241,9 @@ func (m *Message) ProcessRefresh3ms() { m.ProcessRefresh("3ms") } func (m *Message) ProcessRefresh30ms() { m.ProcessRefresh("30ms") } func (m *Message) ProcessRefresh300ms() { m.ProcessRefresh("300ms") } func (m *Message) ProcessRefresh3s() { m.ProcessRefresh("3s") } +func (m *Message) ProcessRewrite(arg ...Any) { + m.Process(PROCESS_REWRITE, arg...) +} func (m *Message) ProcessDisplay(arg ...Any) { m.Process(PROCESS_DISPLAY) m.Option(MSG_DISPLAY, arg...) @@ -268,9 +271,11 @@ func (m *Message) ProcessField(arg ...Any) { } func (m *Message) ProcessInner() { m.Process(PROCESS_INNER) } func (m *Message) ProcessAgain() { m.Process(PROCESS_AGAIN) } -func (m *Message) ProcessOpen(url string) { m.Process(PROCESS_OPEN, url) } func (m *Message) ProcessHold() { m.Process(PROCESS_HOLD) } func (m *Message) ProcessBack() { m.Process(PROCESS_BACK) } +func (m *Message) ProcessRich(arg ...Any) { m.Process(PROCESS_RICH, arg...) } +func (m *Message) ProcessGrow(arg ...Any) { m.Process(PROCESS_GROW, arg...) } +func (m *Message) ProcessOpen(url string) { m.Process(PROCESS_OPEN, url) } func (m *Message) OptionUserWeb() *url.URL { return kit.ParseURL(m.Option(MSG_USERWEB))