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

a

Browse Source
This commit is contained in:
shaoying 2018-10-23 23:23:06 +08:00
parent 5724bec9a7
commit 1bd5acc897
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/contexts/mdb/mdb.go
View File

@ -192,7 +192,7 @@ var Index = &ctx.Context{Name: "mdb", Help: "数据中心",
"show": &ctx.Command{Name: "show table fields...",
Help: "查询数据库, table: 表名, fields: 字段, where: 查询条件, group: 聚合字段, order: 排序字段",
Form: map[string]int{"where": 1, "group": 1, "order": 1, "limit": 1, "offset": 1, "other": -1,
"extra_field": 1, "extra_chains": 1, "extra_format": 1, "trans_field": 1, "trans_map": 2},
"extra_field": 1, "extra_fields": 1, "extra_chains": 1, "extra_format": 1, "trans_field": 1, "trans_map": 2},
Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) {
if _, ok := m.Target().Server.(*MDB); m.Assert(ok) {
table := m.Confx("table", arg, 0)
@ -237,7 +237,23 @@ var Index = &ctx.Context{Name: "mdb", Help: "数据中心",
}
for i := 0; i < len(m.Meta[m.Option("extra_field")]); i++ {
json.Unmarshal([]byte(m.Meta[m.Option("extra_field")][i]), &m.Target().Configs["template_value"].Value)
switch v := m.Confv("template_value", m.Option("extra_chains")).(type) {
if m.Options("extra_chains") {
m.Target().Configs["template_value"].Value = m.Confv("template_value", m.Option("extra_chains"))
}
fields = strings.Split(m.Option("extra_fields"), " ")
switch v := m.Confv("template_value").(type) {
case map[string]interface{}:
for _, k := range fields {
if k == "" {
continue
}
if val, ok := v[k]; ok {
m.Add("append", k, fmt.Sprintf(format, val))
} else {
m.Add("append", k, fmt.Sprintf(format, ""))
}
}
m.Meta[m.Option("extra_field")][i] = ""
case float64:
m.Meta[m.Option("extra_field")][i] = fmt.Sprintf(format, int(v))
default:

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

@ -798,7 +798,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
//
tmpl := template.New("render").Funcs(ctx.CGI)
tmpl.ParseGlob("/Users/shaoying/context/usr/template/common/base.tmpl")
tmpl.ParseGlob("/home/shaoying/context/usr/template/common/base.tmpl")
w := m.Optionv("response").(http.ResponseWriter)
if accept_json {

2
usr/template/common/base.tmpl
View File

@ -74,7 +74,7 @@
{{end}}
{{define "componet"}}
<fieldset><legend title="{{option .Meta "help"}}">{{option .Meta "context"}}.{{option .Meta "command"}}</legend>
<fieldset><legend title="{{option .Meta "help"}}">{{option .Meta "help"}}({{option .Meta "command"}}.{{option .Meta "context"}})</legend>
<form class="option {{option .Meta "name"}}"
data-last_componet_group="{{option . "last_componet_group"|meta}}"
data-last_componet_order="{{option . "last_componet_order"|meta}}"