diff --git a/core/code/js.go b/core/code/js.go index a95c48d1..68a247df 100644 --- a/core/code/js.go +++ b/core/code/js.go @@ -74,9 +74,14 @@ func _js_show(m *ice.Message, arg ...string) { m.StatusTimeCount() } func _js_exec(m *ice.Message, arg ...string) { - m.Display(path.Join("/require", path.Join(arg[2], arg[1]))) - key := ctx.GetFileCmd(kit.Replace(path.Join(arg[2], arg[1]), ".js", ".go")) + if arg[2] == "usr/volcanos/" && strings.HasPrefix(arg[1], "plugin/local/") { + key := "web."+strings.ReplaceAll(strings.TrimSuffix(strings.TrimPrefix(arg[1], "plugin/local/"), ".js"), ice.PS, ice.PT) ctx.ProcessCommand(m, kit.Select("can.code.inner._plugin", key), kit.Simple()) + return + } + m.Display(path.Join("/require", path.Join(arg[2], arg[1]))) + key := ctx.GetFileCmd(kit.Replace(path.Join(arg[2], arg[1]), ".js", ".go")) + ctx.ProcessCommand(m, kit.Select("can.code.inner._plugin", key), kit.Simple()) return args := kit.Simple("node", "-e", kit.Join(_js_main_script(m, arg...), ice.NL)) m.Cmdy(cli.SYSTEM, args).StatusTime(ctx.ARGS, kit.Join(append([]string{ice.ICE_BIN, m.PrefixKey(), m.ActionKey()}, arg...), ice.SP)) diff --git a/core/team/epic.go b/core/team/epic.go index dbe65d21..64be4227 100644 --- a/core/team/epic.go +++ b/core/team/epic.go @@ -14,7 +14,7 @@ const EPIC = "epic" func init() { Index.MergeCommands(ice.Commands{ - EPIC: {Name: "epic hash auto", Help: "史记", Actions: ice.MergeActions(ice.Actions{ + EPIC: {Name: "epic hash list", Help: "史记", Actions: ice.MergeActions(ice.Actions{ mdb.CREATE: {Name: "create time@date zone name"}, mdb.MODIFY: {Name: "modify time@date zone name"}, }, mdb.HashAction(mdb.FIELD, "time,hash,zone,name")), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...).Tables(func(value ice.Maps) { diff --git a/misc/webview/webview.go b/misc/webview/webview.go index 415eac1a..60ec0a89 100644 --- a/misc/webview/webview.go +++ b/misc/webview/webview.go @@ -13,22 +13,34 @@ import ( type WebView struct { webview.WebView Source string + *ice.Message } func (w WebView) Menu() bool { list := []string{} - ice.Pulse.Cmd(nfs.CAT, w.Source, func(ls []string, line string) { + link := "" + w.Cmd(nfs.CAT, w.Source, func(ls []string, line string) { if strings.HasPrefix(line, "# ") { return } if len(ls) > 1 { list = append(list, kit.Format(``, ls[0], ls[0])) w.WebView.Bind(ls[0], func() { w.navigate(ls[1]) }) + link = ls[1] } }) if len(list) == 0 { return false } + if len(list) == 1 { + if ls := kit.Split(w.Cmdx(nfs.CAT, "etc/webview.size")); len(ls) > 1 { + w.WebView.SetSize(kit.Int(ls[0]), kit.Int(ls[1])+28, webview.HintNone) + } else { + w.WebView.SetSize(1200, 800, webview.HintNone) + } + w.WebView.Navigate(link) + return true + } w.WebView.SetTitle(ice.CONTEXTS) w.WebView.SetSize(200, 60*len(list), webview.HintNone) @@ -54,11 +66,14 @@ func (w WebView) Menu() bool { func (w WebView) Title(text string) { w.WebView.SetTitle(text) } func (w WebView) Webview(url string) { w.WebView.Navigate(url) } func (w WebView) Open(url string) { w.WebView.Navigate(url) } -func (w WebView) OpenUrl(url string) { ice.Pulse.Cmd(cli.SYSTEM, "open", url) } -func (w WebView) OpenApp(app string) { ice.Pulse.Cmd(cli.SYSTEM, "open", "-a", app) } +func (w WebView) OpenUrl(url string) { w.Cmd(cli.SYSTEM, "open", url) } +func (w WebView) OpenApp(app string) { w.Cmd(cli.SYSTEM, "open", "-a", app) } func (w WebView) OpenCmd(cmd string) { - ice.Pulse.Cmd(nfs.SAVE, kit.HomePath(".bash_temp"), cmd) - ice.Pulse.Cmd(cli.SYSTEM, "open", "-a", "Terminal") + w.Cmd(nfs.SAVE, kit.HomePath(".bash_temp"), cmd) + w.Cmd(cli.SYSTEM, "open", "-a", "Terminal") +} +func (w WebView) SetSize(width, height int) { + w.Cmd(nfs.SAVE, "etc/webview.size", kit.Format("%v,%v", width, height)) } func (w WebView) Terminate() { w.WebView.Terminate() } func (w WebView) Close() { @@ -76,7 +91,7 @@ func Run(cb func(*WebView) ice.Any) { defer w.Destroy() defer w.Run() - view := &WebView{Source: "etc/webview.txt", WebView: w} + view := &WebView{Source: "etc/webview.txt", WebView: w, Message: ice.Pulse} kit.Reflect(cb(view), func(name string, value ice.Any) { w.Bind(name, value) }) if !view.Menu() {