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

tce add nothing

Browse Source
This commit is contained in:
shaoying 2018-05-23 19:29:22 +08:00
parent 9a9c18d362
commit 05d99a7bbb
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/contexts/web/web.go
View File

@ -722,7 +722,9 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
msg.Add("append", "help", v.Help) msg.Add("append", "help", v.Help)
msg.Add("append", "value", v.Value) 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()) msg = msg.Spawn(msg.Target())
for k, v := range msg.Target().Configs { 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", "value", v.Value)
msg.Add("append", "input", "") 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()) msg = msg.Spawn(msg.Target())
for k, v := range msg.Target().Commands { 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", "help", v.Help)
msg.Add("append", "input", "") 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 = msg.Spawn(msg.Target())
msg.Travel(msg.Target(), func(m *ctx.Message) bool { 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") w.Header().Add("Content-Type", "text/html")
msg.Put("option", "target", msg.Target()) 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)) m.Assert(template.Must(template.ParseGlob(m.Conf("travel_tpl"))).ExecuteTemplate(w, "tail", m.Meta))
delete(m.Meta, "result") delete(m.Meta, "result")

29
usr/travel.html
View File

@ -47,6 +47,8 @@
<table> <table>
<colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup> <colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup>
<tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr> <tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr>
{{$l := index .append|len}}
{{if gt $l 0}}
{{$meta := .}} {{$first := index .append 0}} {{$meta := .}} {{$first := index .append 0}}
{{range $i, $k := index . $first}} {{range $i, $k := index . $first}}
<tr> <tr>
@ -57,6 +59,7 @@
{{end}} {{end}}
</tr> </tr>
{{end}} {{end}}
{{end}}
</table> </table>
</fieldset> </fieldset>
{{end}} {{end}}
@ -66,6 +69,8 @@
<table> <table>
<colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup> <colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup>
<tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr> <tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr>
{{$l := index .append|len}}
{{if gt $l 0}}
{{$meta := .}} {{$first := index .append 0}} {{$meta := .}} {{$first := index .append 0}}
{{range $i, $k := index . $first}} {{range $i, $k := index . $first}}
<tr>{{$config := index $meta "key" $i}} <tr>{{$config := index $meta "key" $i}}
@ -83,6 +88,7 @@
{{end}} {{end}}
</tr> </tr>
{{end}} {{end}}
{{end}}
</table> </table>
</fieldset> </fieldset>
{{end}} {{end}}
@ -92,6 +98,8 @@
<table> <table>
<colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup> <colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup>
<tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr> <tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr>
{{$l := index .append|len}}
{{if gt $l 0}}
{{$meta := .}} {{$first := index .append 0}} {{$meta := .}} {{$first := index .append 0}}
{{range $i, $k := index . $first}} {{range $i, $k := index . $first}}
<tr onclick="return Direct(event)">{{$command := index $meta "key" $i}} <tr onclick="return Direct(event)">{{$command := index $meta "key" $i}}
@ -108,9 +116,10 @@
{{end}} {{end}}
</tr> </tr>
{{end}} {{end}}
{{end}}
</table> </table>
</fieldset> </fieldset>
<fieldset><legend>result</legend> <fieldset><legend>result<input id="direct" type="text" onkeydown="return Direct(event)"></legend>
<pre class="result"><code id="result"> <pre class="result"><code id="result">
</code></pre> </code></pre>
</fieldset> </fieldset>
@ -121,6 +130,8 @@
<table> <table>
<colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup> <colgroup>{{range .append}}<col class="{{.}}">{{end}}</colgroup>
<tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr> <tr>{{range .append}}<th class="{{.}}" onclick="list('{{.}}')">{{.}}</th>{{end}}</tr>
{{$l := index .append|len}}
{{if gt $l 0}}
{{$meta := .}} {{$first := index .append 0}} {{$meta := .}} {{$first := index .append 0}}
{{range $i, $k := index . $first}} {{range $i, $k := index . $first}}
<tr> <tr>
@ -137,6 +148,7 @@
{{end}} {{end}}
</tr> </tr>
{{end}} {{end}}
{{end}}
</table> </table>
</fieldset> </fieldset>
{{end}} {{end}}
@ -212,19 +224,26 @@
function Command(event, name) { function Command(event, name) {
if (event.keyCode == 13) { 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) { function Direct(event, name, value) {
console.log(event) console.log(event)
if (name) { if (event.keyCode == 13) {
if (!name) {
name = event.currentTarget.value;
}
POST("", {ccc:"command", name:name, value:value||""}, function(msg) { POST("", {ccc:"command", name:name, value:value||""}, function(msg) {
var result = document.getElementById("result"); 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) { function list(what) {