From 6698cf3e0d7693610e5758949bd9a842612636be Mon Sep 17 00:00:00 2001 From: harveyshao Date: Tue, 10 May 2022 11:08:51 +0800 Subject: [PATCH] opt some --- core/code/autogen.go | 2 +- core/code/binpack.go | 4 +--- core/code/vimer.go | 4 ++-- core/team/plan.go | 2 +- core/team/todo.go | 2 +- core/wiki/word.go | 2 +- misc.go | 9 ++++++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/code/autogen.go b/core/code/autogen.go index d8aeda69..16b67dac 100644 --- a/core/code/autogen.go +++ b/core/code/autogen.go @@ -170,7 +170,7 @@ func init() { m.Cmdy(nfs.DIR, ice.SRC, nfs.DIR_CLI_FIELDS, kit.Dict(nfs.DIR_REG, `.*\.go`)).RenameAppend(nfs.PATH, arg[0]) } }}, - mdb.CREATE: {Name: "create main=src/main.go@key zone name=hi help type=Hash,Zone,Lists,Data,Code list key", Help: "模块", Hand: func(m *ice.Message, arg ...string) { + mdb.CREATE: {Name: "create main=src/main.go@key zone name=hi help type=Hash,Zone,Lists,Data,Code key", Help: "模块", Hand: func(m *ice.Message, arg ...string) { _defs(m, mdb.ZONE, m.Option(mdb.NAME), mdb.HELP, m.Option(mdb.NAME)) _defs(m, mdb.KEY, kit.Keys("web.code", m.Option(mdb.ZONE), m.Option(mdb.NAME))) m.Option(mdb.TEXT, kit.Format("`name:\"%s\" help:\"%s\"`", _defs_list(m), m.Option(mdb.HELP))) diff --git a/core/code/binpack.go b/core/code/binpack.go index 26e69f68..1fe3a2d6 100644 --- a/core/code/binpack.go +++ b/core/code/binpack.go @@ -33,7 +33,7 @@ func _binpack_dir(m *ice.Message, f *os.File, dir string) { m.Cmd(nfs.DIR, nfs.PWD).Sort(nfs.PATH).Tables(func(value map[string]string) { switch path.Base(value[nfs.PATH]) { - case "go.sum", "binpack.go": + case "go.mod", "go.sum", "binpack.go", "version.go": return } switch strings.Split(value[nfs.PATH], ice.PS)[0] { @@ -146,8 +146,6 @@ func init() { fmt.Fprintln(f, _binpack_file(m, ice.ETC_EXIT_SHY)) fmt.Fprintln(f) - fmt.Fprintln(f, _binpack_file(m, ice.GO_MOD)) - fmt.Fprintln(f, _binpack_file(m, ice.GO_SUM)) fmt.Fprintln(f, _binpack_file(m, ice.MAKEFILE)) fmt.Fprintln(f, _binpack_file(m, ice.README_MD)) fmt.Fprintln(f) diff --git a/core/code/vimer.go b/core/code/vimer.go index 633f096d..66f19e22 100644 --- a/core/code/vimer.go +++ b/core/code/vimer.go @@ -17,11 +17,11 @@ const VIMER = "vimer" func init() { Index.Merge(&ice.Context{Commands: map[string]*ice.Command{ - VIMER: {Name: "vimer path=src/ file=main.go line=1 auto", Help: "编辑器", Meta: kit.Dict(ice.DisplayLocal("", INNER)), Action: map[string]*ice.Action{ + VIMER: {Name: "vimer path=src/ file=main.go line=1 list", Help: "编辑器", Meta: kit.Dict(ice.DisplayLocal("", INNER)), Action: map[string]*ice.Action{ nfs.SAVE: {Name: "save type file path", Help: "保存", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(nfs.SAVE, path.Join(m.Option(nfs.PATH), m.Option(nfs.FILE))) }}, - AUTOGEN: {Name: "create main=src/main.go zone name=hi help type=Zone,Hash,Lists,Data,Code list key", Help: "模块", Hand: func(m *ice.Message, arg ...string) { + AUTOGEN: {Name: "create main=src/main.go zone name=hi help type=Zone,Hash,Lists,Data,Code key", Help: "模块", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(AUTOGEN, mdb.CREATE, arg) }}, COMPILE: {Name: "compile", Help: "编译", Hand: func(m *ice.Message, arg ...string) { diff --git a/core/team/plan.go b/core/team/plan.go index 1967f4ae..835b06e1 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -66,7 +66,7 @@ const PLAN = "plan" func init() { Index.Merge(&ice.Context{Commands: map[string]*ice.Command{ - PLAN: {Name: "plan scale=week,day,week,month,year,long begin_time@date auto", Help: "计划", Meta: kit.Dict( + PLAN: {Name: "plan scale=week,day,week,month,year,long begin_time@date list", Help: "计划", Meta: kit.Dict( ice.Display("/plugin/local/team/plan.js"), ), Action: ice.MergeAction(map[string]*ice.Action{ mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { diff --git a/core/team/todo.go b/core/team/todo.go index f406c6ca..79a34aa2 100644 --- a/core/team/todo.go +++ b/core/team/todo.go @@ -10,7 +10,7 @@ const TODO = "todo" func init() { Index.Merge(&ice.Context{Commands: map[string]*ice.Command{ - TODO: {Name: "todo hash auto create export import", Help: "待办", Action: ice.MergeAction(map[string]*ice.Action{ + TODO: {Name: "todo hash list create export import", Help: "待办", Action: ice.MergeAction(map[string]*ice.Action{ mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INPUTS, m.PrefixKey(), "", mdb.HASH, arg) m.Cmdy(TASK, mdb.INPUTS, arg) diff --git a/core/wiki/word.go b/core/wiki/word.go index 38d63c0c..8f9dcae6 100644 --- a/core/wiki/word.go +++ b/core/wiki/word.go @@ -38,7 +38,7 @@ func init() { mdb.FIELD, "time,hash,type,name,text", )}, }, Commands: map[string]*ice.Command{ - WORD: {Name: "word path=src/main.shy@key auto play", Help: "语言文字", Meta: kit.Dict(ice.DisplayLocal("")), Action: ice.MergeAction(map[string]*ice.Action{ + WORD: {Name: "word path=src/main.shy@key list play", Help: "语言文字", Meta: kit.Dict(ice.DisplayLocal("")), Action: ice.MergeAction(map[string]*ice.Action{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { m.Cmd(aaa.ROLE, aaa.WHITE, aaa.VOID, m.PrefixKey("src/main.shy")) }}, diff --git a/misc.go b/misc.go index 1a553d07..6045a936 100644 --- a/misc.go +++ b/misc.go @@ -299,9 +299,9 @@ func (c *Context) split(name string) (list []interface{}) { item = kit.Dict(TYPE, BUTTON, NAME, "run") list = append(list, item) button = true - case "text", "args": - item = kit.Dict(TYPE, TEXTAREA, NAME, ls[i]) - list = append(list, item) + case "list": + list = append(list, kit.List(TYPE, BUTTON, NAME, "list", ACTION, AUTO)...) + button = true case "auto": list = append(list, kit.List(TYPE, BUTTON, NAME, "list", ACTION, AUTO)...) list = append(list, kit.List(TYPE, BUTTON, NAME, "back")...) @@ -311,6 +311,9 @@ func (c *Context) split(name string) (list []interface{}) { list = append(list, kit.List(TYPE, TEXT, NAME, "offend")...) list = append(list, kit.List(TYPE, BUTTON, NAME, "prev")...) list = append(list, kit.List(TYPE, BUTTON, NAME, "next")...) + case "text", "args": + item = kit.Dict(TYPE, TEXTAREA, NAME, ls[i]) + list = append(list, item) case ":": if item[TYPE] = kit.Select("", ls, i+1); item[TYPE] == BUTTON {