From 9b11b4aa200651d91599d1fc048c07a539f6a929 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sat, 16 Jan 2021 05:21:31 +0800 Subject: [PATCH] opt route --- base/web/route.go | 3 ++- core/code/inner.go | 4 ++++ core/team/plan.go | 2 +- misc/alpha/alpha.go | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/base/web/route.go b/base/web/route.go index 75204583..9ce079be 100644 --- a/base/web/route.go +++ b/base/web/route.go @@ -115,6 +115,7 @@ func init() { m.Option(ice.MSG_PROCESS, ice.PROCESS_INNER) }}, ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { + m.Debug(m.Option(ROUTE)) m.Cmdy(SPACE, m.Option(ROUTE), kit.Keys(m.Option(kit.SSH_CTX), m.Option(kit.SSH_CMD)), arg) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { @@ -124,7 +125,7 @@ func init() { } } else if len(arg) > 2 { // 加载插件 - m.ShowPlugin(arg[0], arg[1], arg[2], ctx.COMMAND) + m.ShowPlugin(arg[0], arg[1], arg[2], kit.MDB_ACTION, ctx.COMMAND) } else if len(arg) > 1 { // 命令列表 m.Cmd(SPACE, arg[0], ctx.CONTEXT, arg[1], ctx.COMMAND).Table(func(index int, value map[string]string, head []string) { diff --git a/core/code/inner.go b/core/code/inner.go index e719cfd9..f413846f 100644 --- a/core/code/inner.go +++ b/core/code/inner.go @@ -91,6 +91,10 @@ func init() { FAVOR: {Name: "favor insert", Help: "收藏"}, mdb.INPUTS: {Name: "favor inputs", Help: "补全"}, nfs.DIR: {Name: "dir", Help: "目录"}, + + "project": {Name: "project", Help: "项目", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(nfs.DIR, kit.Select("./", arg, 0)) + }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { if len(arg) < 2 { m.Cmdy(nfs.DIR, kit.Select("./", arg, 0)) diff --git a/core/team/plan.go b/core/team/plan.go index 4766b95b..349c27f4 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -15,7 +15,7 @@ const PLAN = "plan" func init() { Index.Merge(&ice.Context{ Commands: map[string]*ice.Command{ - PLAN: {Name: "plan scale=day,week,month,year,long begin_time@date auto insert export import", Help: "计划", Meta: kit.Dict( + PLAN: {Name: "plan scale=day,week,month,year,long begin_time@date where@province auto insert export import", Help: "计划", Meta: kit.Dict( "display", "/plugin/local/team/plan.js", "style", "plan", ), Action: map[string]*ice.Action{ mdb.INSERT: {Name: "insert zone type=once,step,week name text begin_time@date close_time@date", Help: "添加", Hand: func(m *ice.Message, arg ...string) { diff --git a/misc/alpha/alpha.go b/misc/alpha/alpha.go index fd2e9e41..7baacbcd 100644 --- a/misc/alpha/alpha.go +++ b/misc/alpha/alpha.go @@ -79,7 +79,9 @@ var Index = &ice.Context{Name: ALPHA, Help: "英汉词典", _alpha_load(m, m.Option(kit.MDB_FILE), kit.Select(path.Base(m.Option(kit.MDB_FILE)), m.Option(kit.MDB_NAME))) }}, mdb.SEARCH: {Name: "search type name text", Help: "搜索", Hand: func(m *ice.Message, arg ...string) { - _alpha_find(m, kit.Select("word", arg, 2), arg[1]) + if arg[0] == ALPHA { + _alpha_find(m, kit.Select("word", arg, 2), arg[1]) + } }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Option(mdb.FIELDS, "id,word,translation,definition")