From eac98f23f59c2a37eb79df9ddba3ea9563450cd4 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 9 May 2024 07:25:24 +0800 Subject: [PATCH] add some --- base/mdb/mdb.go | 3 +++ core/code/autogen.go | 2 +- core/code/vimer.go | 2 +- meta.go | 6 ++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/base/mdb/mdb.go b/base/mdb/mdb.go index f9b2b9ef..87d12346 100644 --- a/base/mdb/mdb.go +++ b/base/mdb/mdb.go @@ -244,6 +244,9 @@ var Index = &ice.Context{Name: MDB, Help: "数据模块", Commands: ice.Commands kit.If(key == STATUS, func() { value = kit.Select(ENABLE, value) }) return value }).PushAction().Action(html.FILTER) + if len(arg) == 1 { + m.Cmdy("nfs.cat", "usr/local/export/"+arg[0]+"/hash.json") + } return } m.OptionDefault(CACHE_LIMIT, "-1") diff --git a/core/code/autogen.go b/core/code/autogen.go index b76a3fc2..d025784b 100644 --- a/core/code/autogen.go +++ b/core/code/autogen.go @@ -162,7 +162,7 @@ func init() { if m.WarnNotFound(!nfs.Exists(m, kit.Path(".git")), "未初始化代码库") { return } - m.OptionDefault(mdb.ZONE, m.Option(mdb.NAME), mdb.HELP, m.Option(mdb.NAME)) + m.OptionDefault(mdb.ZONE, m.Option(mdb.NAME), mdb.HELP, m.Option(mdb.NAME), "top", "web.chat") m.OptionDefault(mdb.KEY, kit.Keys(m.Option("top"), strings.ReplaceAll(m.Option(mdb.ZONE), "/", "."), m.Option(mdb.NAME))) m.Option(nfs.FILE, path.Join(m.Option(mdb.ZONE), kit.Keys(m.Option(mdb.NAME), GO))) m.Option(mdb.TEXT, kit.Format("`name:\"list %s\" help:\"%s\"`", _autogen_list(m), m.Option(mdb.HELP))) diff --git a/core/code/vimer.go b/core/code/vimer.go index 91f64a05..5323ed44 100644 --- a/core/code/vimer.go +++ b/core/code/vimer.go @@ -159,7 +159,7 @@ func init() { gdb.Event(m, VIMER_SAVE) }}, nfs.TRASH: {Hand: func(m *ice.Message, arg ...string) { nfs.Trash(m, arg[0]) }}, - nfs.MODULE: {Name: "module name*=hi help=示例 type*=Hash,Zone,Data,Code main*=main.go zone=hi top=web.chat", Help: "模块", Hand: func(m *ice.Message, arg ...string) { + nfs.MODULE: {Name: "module name*=hi help type*=Hash,Zone,Data,Code main*=main.go zone top", Help: "模块", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(AUTOGEN, nfs.MODULE, arg) }}, nfs.SCRIPT: {Name: "script file*", Help: "脚本", Hand: func(m *ice.Message, arg ...string) { diff --git a/meta.go b/meta.go index 02c8e4c7..25d9b160 100644 --- a/meta.go +++ b/meta.go @@ -120,7 +120,9 @@ func (m *Message) Push(key string, value Any, arg ...Any) *Message { m.Push(k, kit.Select(kit.Format(val[k]), value[k])) }) default: - kit.For(kit.Simple(value, arg), func(v string) { + keys := strings.Split(key, ",") + kit.For(kit.Simple(value, arg), func(v string, i int) { + key = kit.Select(keys[0], keys, i) key = strings.TrimSuffix(key, "*") if m.FieldsIsDetail() { m.Add(MSG_APPEND, KEY, key).Add(MSG_APPEND, VALUE, kit.Format(value)) @@ -292,7 +294,7 @@ func (m *Message) Sort(key string, arg ...Any) *Message { key := m.value(KEY) value := m.value(VALUE) for i := 0; i < len(key)-1; i++ { - for j := i+1; j < len(key); j++ { + for j := i + 1; j < len(key); j++ { if key[i] > key[j] { key[i], key[j] = key[j], key[i] value[i], value[j] = value[j], value[i]