From 05d99a7bbb3edd46ed93f5dabbe66993875eb77e Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 23 May 2018 19:29:22 +0800 Subject: [PATCH] tce add nothing --- src/contexts/web/web.go | 16 ++++++++++++---- usr/travel.html | 29 ++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/contexts/web/web.go b/src/contexts/web/web.go index 03d31e32..0d126142 100644 --- a/src/contexts/web/web.go +++ b/src/contexts/web/web.go @@ -722,7 +722,9 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", msg.Add("append", "help", v.Help) msg.Add("append", "value", v.Value) } - m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "cache", msg.Meta)) + if len(msg.Meta["append"]) > 0 { + m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "cache", msg.Meta)) + } msg = msg.Spawn(msg.Target()) for k, v := range msg.Target().Configs { @@ -732,7 +734,9 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", msg.Add("append", "value", v.Value) msg.Add("append", "input", "") } - m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "config", msg.Meta)) + if len(msg.Meta["append"]) > 0 { + m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "config", msg.Meta)) + } msg = msg.Spawn(msg.Target()) for k, v := range msg.Target().Commands { @@ -741,7 +745,9 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", msg.Add("append", "help", v.Help) msg.Add("append", "input", "") } - m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "command", msg.Meta)) + if len(msg.Meta["append"]) > 0 { + m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "command", msg.Meta)) + } msg = msg.Spawn(msg.Target()) msg.Travel(msg.Target(), func(m *ctx.Message) bool { @@ -754,7 +760,9 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", }) w.Header().Add("Content-Type", "text/html") msg.Put("option", "target", msg.Target()) - m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "context", msg.Meta)) + if len(msg.Meta["append"]) > 0 { + m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "context", msg.Meta)) + } m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "tail", m.Meta)) delete(m.Meta, "result") diff --git a/usr/travel.html b/usr/travel.html index 59339b6f..91b6e216 100644 --- a/usr/travel.html +++ b/usr/travel.html @@ -47,6 +47,8 @@ {{range .append}}{{end}}{{range .append}}{{end}} + {{$l := index .append|len}} + {{if gt $l 0}} {{$meta := .}} {{$first := index .append 0}} {{range $i, $k := index . $first}} @@ -57,6 +59,7 @@ {{end}} {{end}} + {{end}}
{{.}}
{{end}} @@ -66,6 +69,8 @@ {{range .append}}{{end}}{{range .append}}{{end}} + {{$l := index .append|len}} + {{if gt $l 0}} {{$meta := .}} {{$first := index .append 0}} {{range $i, $k := index . $first}} {{$config := index $meta "key" $i}} @@ -83,6 +88,7 @@ {{end}} {{end}} + {{end}}
{{.}}
{{end}} @@ -92,6 +98,8 @@ {{range .append}}{{end}}{{range .append}}{{end}} + {{$l := index .append|len}} + {{if gt $l 0}} {{$meta := .}} {{$first := index .append 0}} {{range $i, $k := index . $first}} {{$command := index $meta "key" $i}} @@ -108,9 +116,10 @@ {{end}} {{end}} + {{end}}
{{.}}
-
result +
result

 
@@ -121,6 +130,8 @@ {{range .append}}{{end}}{{range .append}}{{end}} + {{$l := index .append|len}} + {{if gt $l 0}} {{$meta := .}} {{$first := index .append 0}} {{range $i, $k := index . $first}} @@ -137,6 +148,7 @@ {{end}} {{end}} + {{end}}
{{.}}
{{end}} @@ -212,19 +224,26 @@ function Command(event, name) { if (event.keyCode == 13) { - POST("", {ccc:"command", name:name, value:event.currentTarget.value}, function(msg) {alert(msg.result.join(""))}) + if (name) { + POST("", {ccc:"command", name:name, value:event.currentTarget.value}, function(msg) {alert(msg.result.join(""))}) + } } } function Direct(event, name, value) { console.log(event) - if (name) { + if (event.keyCode == 13) { + if (!name) { + name = event.currentTarget.value; + } POST("", {ccc:"command", name:name, value:value||""}, function(msg) { var result = document.getElementById("result"); - result.innerHTML = msg.result.join("") + var direct = document.getElementById("direct"); + direct.innerHTML = name; + result.innerHTML = msg.result.join(""); }) + return false; } - return false; } function list(what) {