x/ContextOS
1
0
Fork 1
mirror of https://shylinux.com/x/ContextOS synced 2025-04-26 17:24:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix wiki bug

Browse Source 
Change-Id: Ieaa79c89007739f8292e03f93c93965f5468acdd
This commit is contained in:
shaoying 2019-02-27 17:19:03 +08:00
parent 89bffe8ea4
commit 8ec00f1002
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/contexts/ctx/ctx_type.go
View File

@ -1000,7 +1000,7 @@ func (m *Message) Table(cbs ...interface{}) *Message {
return m return m
} }
func (m *Message) Sort(key string, arg ...string) *Message { func (m *Message) Sort(key string, arg ...string) *Message {
cmp := "string" cmp := "str"
if len(arg) > 0 { if len(arg) > 0 {
cmp = arg[0] cmp = arg[0]
} }

3
src/examples/code/code.go
View File

@ -244,13 +244,10 @@ var Index = &ctx.Context{Name: "code", Help: "代码中心",
} }
} }
m.Log("fuck", "what %v", p)
if _, e = os.Stat(p); e != nil { if _, e = os.Stat(p); e != nil {
list := strings.Split(key, "/") list := strings.Split(key, "/")
m.Log("fuck", "what %v", list)
p = m.Cmdx("nfs.path", m.Conf("upgrade", []string{"file", list[len(list)-1]})) p = m.Cmdx("nfs.path", m.Conf("upgrade", []string{"file", list[len(list)-1]}))
} }
m.Log("fuck", "what %v", p)
m.Log("info", "upgrade %s %s", p, m.Cmdx("aaa.hash", "file", p)) m.Log("info", "upgrade %s %s", p, m.Cmdx("aaa.hash", "file", p))
http.ServeFile(m.Optionv("response").(http.ResponseWriter), m.Optionv("request").(*http.Request), p) http.ServeFile(m.Optionv("response").(http.ResponseWriter), m.Optionv("request").(*http.Request), p)

18
src/examples/wiki/wiki.go
View File

@ -21,29 +21,29 @@ var Index = &ctx.Context{Name: "wiki", Help: "文档中心",
Configs: map[string]*ctx.Config{ Configs: map[string]*ctx.Config{
"wiki_dir": &ctx.Config{Name: "wiki_dir", Value: "usr/wiki", Help: "路由数量"}, "wiki_dir": &ctx.Config{Name: "wiki_dir", Value: "usr/wiki", Help: "路由数量"},
"wiki_favor": &ctx.Config{Name: "wiki_favor", Value: "lamp.md", Help: "路由数量"}, "wiki_favor": &ctx.Config{Name: "wiki_favor", Value: "lamp.md", Help: "路由数量"},
"wiki_list": &ctx.Config{Name: "wiki_list", Value: []interface{}{}, Help: "路由数量"},
"wiki_list": &ctx.Config{Name: "wiki_list", Value: []interface{}{}, Help: "路由数量"},
"wiki_list_show": &ctx.Config{Name: "wiki_list_show", Value: map[string]interface{}{ "wiki_list_show": &ctx.Config{Name: "wiki_list_show", Value: map[string]interface{}{
"md": true, "md": true,
}, Help: "路由数量"}, }, Help: "路由数量"},
"bench_disable": &ctx.Config{Name: "bench_disable", Value: "true", Help: "工作流"},
"login_right": &ctx.Config{Name: "login_right", Value: "1", Help: "默认组件"},
"bench_disable": &ctx.Config{Name: "bench_disable", Value: "true", Help: "工作流"},
"login_right": &ctx.Config{Name: "login_right", Value: "1", Help: "默认组件"},
"componet_group": &ctx.Config{Name: "component_group", Value: "index", Help: "默认组件"}, "componet_group": &ctx.Config{Name: "component_group", Value: "index", Help: "默认组件"},
"componet": &ctx.Config{Name: "componet", Value: map[string]interface{}{ "componet": &ctx.Config{Name: "componet", Value: map[string]interface{}{
"index": []interface{}{ "index": []interface{}{
map[string]interface{}{"componet_name": "head", "template": "head"}, map[string]interface{}{"name": "head", "template": "head"},
map[string]interface{}{"componet_name": "header", "template": "header"}, map[string]interface{}{"name": "header", "template": "header"},
map[string]interface{}{"componet_name": "list", "template": "list", map[string]interface{}{"name": "list", "template": "list",
"componet_ctx": "web.wiki", "componet_cmd": "wiki_list", "arguments": []interface{}{"h2", "int_r"}, "componet_ctx": "web.wiki", "componet_cmd": "wiki_list", "arguments": []interface{}{"h2", "int_r"},
"pre_run": true, "pre_run": true,
}, },
map[string]interface{}{"componet_name": "text", "template": "text", map[string]interface{}{"name": "text", "template": "text",
"componet_ctx": "web.wiki", "componet_cmd": "wiki_body", "arguments": []interface{}{"@wiki_favor"}, "componet_ctx": "web.wiki", "componet_cmd": "wiki_body", "arguments": []interface{}{"@wiki_favor"},
"pre_run": true, "pre_run": true,
}, },
map[string]interface{}{"componet_name": "footer", "template": "footer"}, map[string]interface{}{"name": "footer", "template": "footer"},
map[string]interface{}{"componet_name": "tail", "template": "tail"}, map[string]interface{}{"name": "tail", "template": "tail"},
}, },
}, Help: "组件列表"}, }, Help: "组件列表"},
}, },

4
usr/template/wiki/wiki.tmpl
View File

@ -213,7 +213,7 @@ footer .title {
{{end}} {{end}}
{{define "tail"}} {{define "tail"}}
<script src="/librarys/context.js"></script> <script src="/static/librarys/context.js"></script>
<script src="/librarys/wiki.js"></script> <script src="/static/librarys/wiki.js"></script>
</body> </body>
{{end}} {{end}}