From 31a5be0e6f1165e54b64dc694513f4ffeedbe58d Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 31 Oct 2023 07:35:33 +0800 Subject: [PATCH] add some --- base/web/dream.go | 21 ++++++++------------- base/web/space.go | 3 ++- core/code/inner.go | 2 +- core/team/plan.go | 8 +++----- core/team/task.go | 15 ++++++++++++--- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index f860b07f..11764489 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -133,7 +133,7 @@ const DREAM = "dream" func init() { Index.MergeCommands(ice.Commands{ - DREAM: {Name: "dream name@key auto create repos startall stopall build cmd cat", Icon: "Launchpad.png", Help: "梦想家", Actions: ice.MergeActions(ice.Actions{ + DREAM: {Name: "dream name@key auto create repos startall stopall publish cmd cat", Icon: "Launchpad.png", Help: "梦想家", Actions: ice.MergeActions(ice.Actions{ ctx.CONFIG: {Hand: func(m *ice.Message, arg ...string) { for _, cmd := range kit.Reverse(arg) { m.Cmd(gdb.EVENT, gdb.LISTEN, gdb.EVENT, DREAM_TABLES, ice.CMD, cmd) @@ -232,25 +232,21 @@ func init() { return nil }) }}, - cli.BUILD: {Hand: func(m *ice.Message, arg ...string) { + "publish": {Name: "发布", Hand: func(m *ice.Message, arg ...string) { GoToast(m, "", func(toast func(string, int, int)) []string { msg := mdb.HashSelect(m.Spawn()) msg.Table(func(index int, value ice.Maps) { toast(value[mdb.NAME], index, msg.Length()) - m.Push(mdb.NAME, value[mdb.NAME]) - m.Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.LINUX)) - m.Push(mdb.NAME, value[mdb.NAME]) - m.Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.DARWIN)) - m.Push(mdb.NAME, value[mdb.NAME]) - m.Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.WINDOWS)) + m.Push(mdb.NAME, value[mdb.NAME]).Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.LINUX)) + m.Push(mdb.NAME, value[mdb.NAME]).Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.DARWIN)) + m.Push(mdb.NAME, value[mdb.NAME]).Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], "compile", cli.WINDOWS)) }) return nil }) }}, nfs.CAT: {Name: "cat file*", Help: "文件", Hand: func(m *ice.Message, arg ...string) { mdb.HashSelect(m.Spawn()).Table(func(value ice.Maps) { - m.Push(mdb.NAME, value[mdb.NAME]) - m.Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], nfs.CAT, m.Option(nfs.FILE))) + m.Push(mdb.NAME, value[mdb.NAME]).Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], nfs.CAT, m.Option(nfs.FILE))) }) m.StatusTimeCount(nfs.FILE, m.Option(nfs.FILE)) }}, @@ -259,8 +255,7 @@ func init() { msg := mdb.HashSelect(m.Spawn()) msg.Table(func(index int, value ice.Maps) { toast(value[mdb.NAME], index, msg.Length()) - m.Push(mdb.NAME, value[mdb.NAME]) - m.Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], kit.Split(m.Option("cmd")))) + m.Push(mdb.NAME, value[mdb.NAME]).Push(mdb.TEXT, m.Cmdx(SPACE, value[mdb.NAME], kit.Split(m.Option(ice.CMD)))) }) return nil }) @@ -271,10 +266,10 @@ func init() { }}, cli.STOP: {Hand: func(m *ice.Message, arg ...string) { defer ToastProcess(m)() - defer m.Sleep3s() gdb.Event(m, DREAM_STOP, arg) m.Cmd(SPACE, mdb.MODIFY, m.OptionSimple(mdb.NAME), mdb.STATUS, cli.STOP) m.Cmd(SPACE, m.Option(mdb.NAME), ice.EXIT) + m.Sleep3s() }}, nfs.TRASH: {Hand: func(m *ice.Message, arg ...string) { gdb.Event(m, DREAM_TRASH, arg) diff --git a/base/web/space.go b/base/web/space.go index 3ff63525..acf91241 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -245,9 +245,10 @@ func init() { _space_dial(m, m.Option(ice.DEV), kit.Select(ice.Info.NodeName, m.Option(mdb.NAME)), arg...) }}, mdb.REMOVE: {Hand: func(m *ice.Message, arg ...string) { + defer ToastProcess(m)() mdb.HashModify(m, m.OptionSimple(mdb.NAME), mdb.STATUS, cli.STOP) m.Cmd("", m.Option(mdb.NAME), ice.EXIT) - m.Sleep300ms() + m.Sleep3s() }}, DOMAIN: {Hand: func(m *ice.Message, arg ...string) { m.Echo(_space_domain(m)) }}, LOGIN: {Help: "授权", Hand: func(m *ice.Message, arg ...string) { diff --git a/core/code/inner.go b/core/code/inner.go index b531b594..390b5a99 100644 --- a/core/code/inner.go +++ b/core/code/inner.go @@ -120,7 +120,7 @@ func init() { if ctx.DisplayLocal(m, ""); !strings.HasPrefix(arg[0], ice.USR_INSTALL) { m.Option(REPOS, kit.Join(m.Cmd(REPOS, ice.OptionFields(nfs.PATH)).Sort(nfs.PATH).Appendv(nfs.PATH))) } - m.StatusTime(mdb.TIME, ice.Info.Make.Time, nfs.FILE, arg[1], nfs.LINE, kit.Select("1", arg, 2), cli.BACK, "0") + m.StatusTime(mdb.TIME, ice.Info.Make.Time, nfs.FILE, arg[1], nfs.LINE, kit.Select("1", arg, 2)) } }}, }) diff --git a/core/team/plan.go b/core/team/plan.go index 57296fef..6b3f19af 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -50,6 +50,7 @@ const ( ) const ( TASK_POD = "task.pod" + SCALE = "scale" ) const PLAN = "plan" @@ -58,11 +59,8 @@ func init() { Index.MergeCommands(ice.Commands{ PLAN: {Name: "plan scale=month,day,week,month,year,long begin_time@date list insert prev next", Icon: "Calendar.png", Help: "计划表", Meta: kit.Dict( ctx.TRANS, kit.Dict(html.INPUT, kit.Dict( - "begin_time", "起始", "end_time", "结束", - "level", "优先级", "score", "完成度", "scale", "跨度", "view", "视图", - "day", "日", "week", "周", "month", "月", "year", "年", "long", "代", - "prepare", "准备中", "process", "进行中", "cancel", "已取消", "finish", "已完成", - "once", "一次性", "step", "阶段性", + SCALE, "跨度", "view", "视图", + DAY, "日", WEEK, "周", MONTH, "月", YEAR, "年", LONG, "代", )), ), Actions: ice.MergeActions(ice.Actions{ mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(TODO, mdb.INPUTS, arg) }}, diff --git a/core/team/task.go b/core/team/task.go index e037f79f..61e022d5 100644 --- a/core/team/task.go +++ b/core/team/task.go @@ -4,9 +4,11 @@ import ( "strings" ice "shylinux.com/x/icebergs" + "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/icebergs/base/web" + "shylinux.com/x/icebergs/base/web/html" kit "shylinux.com/x/toolkits" ) @@ -65,7 +67,14 @@ const TASK = "task" func init() { Index.MergeCommands(ice.Commands{ - TASK: {Help: "任务", Actions: ice.MergeActions(ice.Actions{ + TASK: {Help: "任务", Meta: kit.Dict( + ctx.TRANS, kit.Dict(html.INPUT, kit.Dict( + BEGIN_TIME, "起始时间", END_TIME, "结束时间", + LEVEL, "优先级", SCORE, "完成度", + PREPARE, "准备中", PROCESS, "进行中", CANCEL, "已取消", FINISH, "已完成", + ONCE, "一次性", STEP, "阶段性", WEEK, "周期性", + )), + ), Actions: ice.MergeActions(ice.Actions{ mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { switch mdb.ZoneInputs(m, arg); strings.TrimPrefix(arg[0], "extra.") { case mdb.STATUS: @@ -77,11 +86,11 @@ func init() { } kit.If(arg[0] == mdb.ZONE, func() { m.Push(arg[0], kit.Split(nfs.TemplateText(m, mdb.ZONE))) }) }}, - mdb.INSERT: {Name: "insert space zone* type*=once,step,week name* text begin_time*@date end_time@date", Hand: func(m *ice.Message, arg ...string) { + mdb.INSERT: {Name: "insert space zone* type*=once,step,week name* text begin_time@date end_time@date", Hand: func(m *ice.Message, arg ...string) { if space, arg := arg[1], arg[2:]; space != "" { m.Cmdy(web.SPACE, space, TASK, mdb.INSERT, web.SPACE, "", arg) } else { - mdb.ZoneInsert(m, arg[:2], BEGIN_TIME, m.Time(), STATUS, PREPARE, LEVEL, 3, SCORE, 3, arg[2:]) + mdb.ZoneInsert(m, arg[:2], STATUS, PREPARE, LEVEL, 3, SCORE, 3, kit.ArgDef(arg[2:], BEGIN_TIME, m.Time())) } }}, mdb.MODIFY: {Hand: func(m *ice.Message, arg ...string) { _task_modify(m, arg[0], arg[1], arg[2:]...) }},