1
0
mirror of https://shylinux.com/x/icebergs synced 2025-04-26 09:34:05 +08:00
This commit is contained in:
shaoying 2020-12-02 16:24:42 +08:00
parent ecb21797b9
commit 9ab2d4b8cf
6 changed files with 5 additions and 11 deletions

View File

@ -42,11 +42,9 @@ func _hash_select(m *ice.Message, prefix, chain, field, value string) {
fields := _hash_fields(m) fields := _hash_fields(m)
cb := m.Optionv(SELECT_CB) cb := m.Optionv(SELECT_CB)
m.Richs(prefix, chain, value, func(key string, val map[string]interface{}) { m.Richs(prefix, chain, value, func(key string, val map[string]interface{}) {
m.Debug("what %v", val)
val = kit.GetMeta(val) val = kit.GetMeta(val)
switch cb := cb.(type) { switch cb := cb.(type) {
case func(fields []string, value map[string]interface{}): case func(fields []string, value map[string]interface{}):
m.Debug("what %v", val)
cb(fields, val) cb(fields, val)
default: default:
if m.Option(FIELDS) == DETAIL { if m.Option(FIELDS) == DETAIL {

View File

@ -54,7 +54,6 @@ func Script(m *ice.Message, name string) io.Reader {
} }
m.Option("_script", name) m.Option("_script", name)
m.Debug("name %v", name)
if s, e := os.Open(path.Join(m.Option(nfs.DIR_ROOT), name)); e == nil { if s, e := os.Open(path.Join(m.Option(nfs.DIR_ROOT), name)); e == nil {
return s return s
} }

View File

@ -47,8 +47,10 @@ func init() {
PREFIX, kit.Dict("#", COMMENT), PREFIX, kit.Dict("#", COMMENT),
KEYWORD, kit.Dict( KEYWORD, kit.Dict(
"title", KEYWORD, "title", KEYWORD,
"premenu", KEYWORD,
"chapter", KEYWORD, "chapter", KEYWORD,
"section", KEYWORD, "section", KEYWORD,
"source", KEYWORD,
"refer", KEYWORD, "refer", KEYWORD,
"field", KEYWORD, "field", KEYWORD,
"label", KEYWORD, "label", KEYWORD,

View File

@ -139,9 +139,7 @@ func (b *Label) Init(m *ice.Message, arg ...string) Chart {
return b return b
} }
func (b *Label) Draw(m *ice.Message, x, y int) Chart { func (b *Label) Draw(m *ice.Message, x, y int) Chart {
m.Debug("arg %v", m.Option("order"))
order, _ := kit.Parse(nil, "", kit.Split(m.Option("order"))...).(map[string]interface{}) order, _ := kit.Parse(nil, "", kit.Split(m.Option("order"))...).(map[string]interface{})
m.Debug("order", order)
top := y top := y
for _, line := range b.data { for _, line := range b.data {
@ -202,7 +200,6 @@ func (b *Chain) Init(m *ice.Message, arg ...string) Chart {
b.MarginX = kit.Int(m.Option("marginx")) b.MarginX = kit.Int(m.Option("marginx"))
b.MarginY = kit.Int(m.Option("marginy")) b.MarginY = kit.Int(m.Option("marginy"))
m.Debug("what %v", arg)
// 解析数据 // 解析数据
b.data = kit.Parse(nil, "", b.show(m, arg[0])...).(map[string]interface{}) b.data = kit.Parse(nil, "", b.show(m, arg[0])...).(map[string]interface{})

View File

@ -84,9 +84,9 @@ var Index = &Context{Name: "ice", Help: "冰山模块",
"^_^ 欢迎使用冰山框架 ^_^", "^_^ 欢迎使用冰山框架 ^_^",
"^_^ Welcome to Icebergs World ^_^", "^_^ Welcome to Icebergs World ^_^",
"", "",
"More: shylinuxc@gmail.com", "Report: shylinuxc@gmail.com",
"More: https://shylinux.com", "Public: https://shylinux.com",
"More: https://github.com/shylinux/icebergs", "Source: https://github.com/shylinux/icebergs",
"", "",
}, },
}}, }},

View File

@ -55,7 +55,6 @@ func init() {
} }
} }
m.Debug("what %v", m.Option(SID))
if sid := strings.TrimSpace(m.Option(SID)); m.Option(SID, sid) != "" { if sid := strings.TrimSpace(m.Option(SID)); m.Option(SID, sid) != "" {
if msg := m.Cmd(SESS, sid); msg.Append(kit.MDB_STATUS) != "" { if msg := m.Cmd(SESS, sid); msg.Append(kit.MDB_STATUS) != "" {
m.Option(aaa.USERNAME, msg.Append(aaa.USERNAME)) m.Option(aaa.USERNAME, msg.Append(aaa.USERNAME))
@ -64,7 +63,6 @@ func init() {
// 登录失败 // 登录失败
} }
} }
m.Debug("what %v", m.Option(SID))
m.Render(ice.RENDER_RESULT) m.Render(ice.RENDER_RESULT)
}}, }},
"/sess": {Name: "/sess", Help: "会话", Action: map[string]*ice.Action{ "/sess": {Name: "/sess", Help: "会话", Action: map[string]*ice.Action{