mirror of
https://shylinux.com/x/icebergs
synced 2025-06-27 02:37:31 +08:00
opt some
This commit is contained in:
parent
12313917b8
commit
44fdfc3ce1
@ -125,12 +125,10 @@ func init() {
|
|||||||
m.Option(BG, kit.Select(WHITE, arg, 2))
|
m.Option(BG, kit.Select(WHITE, arg, 2))
|
||||||
m.Option(FG, kit.Select(BLUE, arg, 1))
|
m.Option(FG, kit.Select(BLUE, arg, 1))
|
||||||
|
|
||||||
if len(arg) == 0 {
|
if aaa.SessIsCli(m) {
|
||||||
|
_qrcode_cli(m, kit.Select(m.Conf("web.share", kit.Keym(kit.MDB_DOMAIN)), arg))
|
||||||
} else if aaa.SessIsCli(m) {
|
|
||||||
_qrcode_cli(m, arg[0])
|
|
||||||
} else {
|
} else {
|
||||||
_qrcode_web(m, arg[0])
|
_qrcode_web(m, kit.Select(m.Option(ice.MSG_USERWEB), arg, 0))
|
||||||
}
|
}
|
||||||
}},
|
}},
|
||||||
},
|
},
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package ctx
|
package ctx
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
ice "github.com/shylinux/icebergs"
|
ice "github.com/shylinux/icebergs"
|
||||||
"github.com/shylinux/icebergs/base/mdb"
|
"github.com/shylinux/icebergs/base/mdb"
|
||||||
kit "github.com/shylinux/toolkits"
|
kit "github.com/shylinux/toolkits"
|
||||||
@ -35,12 +37,12 @@ func _command_search(m *ice.Message, kind, name, text string) {
|
|||||||
if key[0] == '/' || key[0] == '_' {
|
if key[0] == '/' || key[0] == '_' {
|
||||||
return // 内部命令
|
return // 内部命令
|
||||||
}
|
}
|
||||||
if name != "" && name != key && name != s.Name {
|
if name != "" && !strings.HasPrefix(key, name) && !strings.Contains(s.Name, name) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
m.PushSearch(kit.SSH_CMD, COMMAND, CONTEXT, m.Prefix(), COMMAND, key,
|
m.PushSearch(kit.SSH_CMD, COMMAND, CONTEXT, s.Cap(ice.CTX_FOLLOW), COMMAND, key,
|
||||||
kit.MDB_TYPE, kind, kit.MDB_NAME, key, kit.MDB_TEXT, m.Prefix(),
|
kit.MDB_TYPE, kind, kit.MDB_NAME, key, kit.MDB_TEXT, s.Cap(ice.CTX_FOLLOW),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -115,6 +115,12 @@ func _dir_show(m *ice.Message, root string, name string, level int, deep bool, d
|
|||||||
}
|
}
|
||||||
|
|
||||||
m.Push(kit.MDB_HASH, kit.Select(hex.EncodeToString(h[:6]), hex.EncodeToString(h[:]), field == kit.MDB_HASH))
|
m.Push(kit.MDB_HASH, kit.Select(hex.EncodeToString(h[:6]), hex.EncodeToString(h[:]), field == kit.MDB_HASH))
|
||||||
|
case kit.MDB_ACTION:
|
||||||
|
if !f.IsDir() && !aaa.SessIsCli(m) {
|
||||||
|
m.PushButton(TRASH)
|
||||||
|
} else {
|
||||||
|
m.Push(field, "")
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
m.Push(field, "")
|
m.Push(field, "")
|
||||||
}
|
}
|
||||||
@ -194,13 +200,8 @@ func init() {
|
|||||||
}
|
}
|
||||||
_dir_show(m, kit.Select("./", m.Option(DIR_ROOT)), arg[0],
|
_dir_show(m, kit.Select("./", m.Option(DIR_ROOT)), arg[0],
|
||||||
0, m.Options(DIR_DEEP), kit.Select(TYPE_BOTH, m.Option(DIR_TYPE)), kit.Regexp(m.Option(DIR_REG)),
|
0, m.Options(DIR_DEEP), kit.Select(TYPE_BOTH, m.Option(DIR_TYPE)), kit.Regexp(m.Option(DIR_REG)),
|
||||||
kit.Split(kit.Select("time,size,path", strings.Join(arg[1:], ","))))
|
kit.Split(kit.Select("time,size,path,action", strings.Join(arg[1:], ","))))
|
||||||
m.SortTimeR(kit.MDB_TIME)
|
m.SortTimeR(kit.MDB_TIME)
|
||||||
if !aaa.SessIsCli(m) {
|
|
||||||
m.Table(func(index int, value map[string]string, head []string) {
|
|
||||||
m.PushButton(kit.Select("", TRASH, !strings.HasSuffix(value[kit.MDB_PATH], "/")))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}},
|
}},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -102,7 +102,7 @@ func init() {
|
|||||||
SHARE: {Name: SHARE, Help: "共享链", Value: kit.Data(kit.MDB_EXPIRE, "72h")},
|
SHARE: {Name: SHARE, Help: "共享链", Value: kit.Data(kit.MDB_EXPIRE, "72h")},
|
||||||
},
|
},
|
||||||
Commands: map[string]*ice.Command{
|
Commands: map[string]*ice.Command{
|
||||||
SHARE: {Name: "share hash auto", Help: "共享链", Action: map[string]*ice.Action{
|
SHARE: {Name: "share hash auto prunes", Help: "共享链", Action: map[string]*ice.Action{
|
||||||
mdb.CREATE: {Name: "create type name text", Help: "创建", Hand: func(m *ice.Message, arg ...string) {
|
mdb.CREATE: {Name: "create type name text", Help: "创建", Hand: func(m *ice.Message, arg ...string) {
|
||||||
m.Cmdy(mdb.INSERT, SHARE, "", mdb.HASH, kit.MDB_TIME, m.Time(m.Conf(SHARE, kit.Keym(kit.MDB_EXPIRE))),
|
m.Cmdy(mdb.INSERT, SHARE, "", mdb.HASH, kit.MDB_TIME, m.Time(m.Conf(SHARE, kit.Keym(kit.MDB_EXPIRE))),
|
||||||
aaa.USERROLE, m.Option(ice.MSG_USERROLE), aaa.USERNAME, m.Option(ice.MSG_USERNAME),
|
aaa.USERROLE, m.Option(ice.MSG_USERROLE), aaa.USERNAME, m.Option(ice.MSG_USERNAME),
|
||||||
@ -119,6 +119,18 @@ func init() {
|
|||||||
m.Cmdy(mdb.SELECT, SHARE, "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH))
|
m.Cmdy(mdb.SELECT, SHARE, "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH))
|
||||||
}},
|
}},
|
||||||
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {}},
|
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {}},
|
||||||
|
mdb.PRUNES: {Name: "prunes before@date", Help: "清理", Hand: func(m *ice.Message, arg ...string) {
|
||||||
|
list := []string{}
|
||||||
|
m.Richs(SHARE, "", kit.MDB_FOREACH, func(key string, value map[string]interface{}) {
|
||||||
|
if value = kit.GetMeta(value); kit.Time(kit.Format(value[kit.MDB_TIME])) < kit.Time(m.Option("before")) {
|
||||||
|
list = append(list, key)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
m.Option(mdb.FIELDS, "time,userrole,username,river,storm,type,name,text")
|
||||||
|
for _, v := range list {
|
||||||
|
m.Cmdy(mdb.DELETE, SHARE, "", mdb.HASH, kit.MDB_HASH, v)
|
||||||
|
}
|
||||||
|
}},
|
||||||
|
|
||||||
LOGIN: {Name: "login userrole=void,tech username", Help: "登录", Hand: func(m *ice.Message, arg ...string) {
|
LOGIN: {Name: "login userrole=void,tech username", Help: "登录", Hand: func(m *ice.Message, arg ...string) {
|
||||||
m.EchoQRCode(kit.MergeURL(_share_domain(m),
|
m.EchoQRCode(kit.MergeURL(_share_domain(m),
|
||||||
@ -140,9 +152,9 @@ func init() {
|
|||||||
|
|
||||||
m.PushAnchor(link)
|
m.PushAnchor(link)
|
||||||
m.PushScript("shell", link)
|
m.PushScript("shell", link)
|
||||||
m.PushQRCode("qrcode", link)
|
m.PushQRCode("scan", link)
|
||||||
} else {
|
} else {
|
||||||
m.Option("_action", "login")
|
m.Action(LOGIN)
|
||||||
}
|
}
|
||||||
}},
|
}},
|
||||||
"/share/": {Name: "/share/", Help: "共享链", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
"/share/": {Name: "/share/", Help: "共享链", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
|
@ -142,7 +142,6 @@ echo "hello world"
|
|||||||
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
m.Option(nfs.DIR_ROOT, m.Conf(PUBLISH, kit.META_PATH))
|
m.Option(nfs.DIR_ROOT, m.Conf(PUBLISH, kit.META_PATH))
|
||||||
m.Cmdy(nfs.DIR, kit.Select("", arg, 0), "time,size,path,link")
|
m.Cmdy(nfs.DIR, kit.Select("", arg, 0), "time,size,path,link")
|
||||||
m.PushAction(mdb.REMOVE)
|
|
||||||
}},
|
}},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -1,37 +1,31 @@
|
|||||||
package team
|
package team
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
ice "github.com/shylinux/icebergs"
|
ice "github.com/shylinux/icebergs"
|
||||||
"github.com/shylinux/icebergs/base/mdb"
|
"github.com/shylinux/icebergs/base/mdb"
|
||||||
kit "github.com/shylinux/toolkits"
|
kit "github.com/shylinux/toolkits"
|
||||||
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const COUNT = "count"
|
const COUNT = "count"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
Index.Merge(&ice.Context{Commands: map[string]*ice.Command{
|
Index.Merge(&ice.Context{Commands: map[string]*ice.Command{
|
||||||
COUNT: {Name: "count zone id auto insert", Help: "倒计时", Meta: kit.Dict(kit.MDB_DISPLAY, COUNT), Action: map[string]*ice.Action{
|
COUNT: {Name: "count begin_time@date end_time@date auto insert", Help: "倒计时", Meta: kit.Dict(kit.MDB_DISPLAY, COUNT), 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) {
|
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) {
|
||||||
m.Cmdy(TASK, mdb.INSERT, arg)
|
m.Cmdy(TASK, mdb.INSERT, arg)
|
||||||
}},
|
}},
|
||||||
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
if len(arg) > 0 && arg[0] == kit.MDB_ACTION {
|
begin_time, end_time := _task_scope(m, 8, append([]string{LONG}, arg...)...)
|
||||||
m.Cmdy(TASK, arg)
|
msg := _plan_list(m.Spawn(), begin_time, end_time)
|
||||||
return
|
// m.PushPodCmd(COUNT, arg...)
|
||||||
}
|
msg.SortTime(BEGIN_TIME)
|
||||||
|
|
||||||
if _task_list(m, kit.Select("", arg, 0), kit.Select("", arg, 1)); len(arg) == 0 {
|
|
||||||
return
|
|
||||||
} else if len(arg) == 1 {
|
|
||||||
m.SortTime(TaskField.BEGIN_TIME)
|
|
||||||
}
|
|
||||||
|
|
||||||
tz := int64(8)
|
tz := int64(8)
|
||||||
m.Table(func(index int, value map[string]string, head []string) {
|
msg.Table(func(index int, value map[string]string, head []string) {
|
||||||
if value[kit.MDB_STATUS] == TaskStatus.CANCEL {
|
if value[kit.MDB_STATUS] == CANCEL {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,10 +34,10 @@ func init() {
|
|||||||
show = append(show, kit.Format(`<div class="%v">%v</div>`, k, value[k]))
|
show = append(show, kit.Format(`<div class="%v">%v</div>`, k, value[k]))
|
||||||
}
|
}
|
||||||
|
|
||||||
t := (kit.Time(value[TaskField.BEGIN_TIME])+int64(time.Hour)*tz)/int64(time.Second)/3600/24 - (time.Now().Unix()+3600*tz)/3600/24
|
t := (kit.Time(value[BEGIN_TIME])+int64(time.Hour)*tz)/int64(time.Second)/3600/24 - (time.Now().Unix()+3600*tz)/3600/24
|
||||||
m.Echo(`<div class="item %s" title="%s">距离 %v%v%v<span class="day"> %v </span>天</div>`,
|
m.Echo(`<div class="item %s" title="%s">距离 %v%v%v<span class="day"> %v </span>天</div>`,
|
||||||
kit.Select("gone", "come", t > 0), value[kit.MDB_TEXT],
|
kit.Select("gone", "come", t > 0), value[kit.MDB_TEXT],
|
||||||
strings.Split(value[TaskField.BEGIN_TIME], " ")[0],
|
strings.Split(value[BEGIN_TIME], " ")[0],
|
||||||
strings.Join(show, ""),
|
strings.Join(show, ""),
|
||||||
kit.Select("已经", "还有", t > 0), t,
|
kit.Select("已经", "还有", t > 0), t,
|
||||||
)
|
)
|
||||||
|
@ -2,9 +2,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg,
|
|||||||
can.onmotion.clear(can)
|
can.onmotion.clear(can)
|
||||||
can.onappend.table(can, msg)
|
can.onappend.table(can, msg)
|
||||||
can.onappend.board(can, msg.Result())
|
can.onappend.board(can, msg.Result())
|
||||||
typeof cb == "function" && cb(msg)
|
can.base.isFunc(cb) && cb(msg)
|
||||||
|
can.onappend.style(can)
|
||||||
},
|
},
|
||||||
}, ["count.css"])
|
})
|
||||||
Volcanos("onaction", {help: "控件交互", list: ["播放"],
|
Volcanos("onaction", {help: "控件交互", list: ["播放"],
|
||||||
"播放": function(event, can) {
|
"播放": function(event, can) {
|
||||||
can.page.Select(can, can._output, "div.item", function(item) {
|
can.page.Select(can, can._output, "div.item", function(item) {
|
||||||
|
@ -1,27 +1,43 @@
|
|||||||
package team
|
package team
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
ice "github.com/shylinux/icebergs"
|
ice "github.com/shylinux/icebergs"
|
||||||
|
"github.com/shylinux/icebergs/base/cli"
|
||||||
"github.com/shylinux/icebergs/base/ctx"
|
"github.com/shylinux/icebergs/base/ctx"
|
||||||
"github.com/shylinux/icebergs/base/gdb"
|
"github.com/shylinux/icebergs/base/gdb"
|
||||||
"github.com/shylinux/icebergs/base/mdb"
|
"github.com/shylinux/icebergs/base/mdb"
|
||||||
kit "github.com/shylinux/toolkits"
|
kit "github.com/shylinux/toolkits"
|
||||||
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func _plan_list(m *ice.Message, begin_time, end_time time.Time) *ice.Message {
|
||||||
|
m.Option(mdb.CACHE_LIMIT, "100")
|
||||||
|
m.Fields(true, "begin_time,close_time,zone,id,level,status,score,type,name,text,extra")
|
||||||
|
m.Option(kit.Keycb(mdb.SELECT), func(key string, fields []string, value, val map[string]interface{}) {
|
||||||
|
begin, _ := time.ParseInLocation(ice.MOD_TIME, kit.Format(value[BEGIN_TIME]), time.Local)
|
||||||
|
if begin_time.After(begin) || begin.After(end_time) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.Push(key, value, fields, val)
|
||||||
|
m.PushButton(_task_action(m, value[STATUS], mdb.PLUGIN))
|
||||||
|
})
|
||||||
|
m.Cmd(mdb.SELECT, TASK, "", mdb.ZONE, kit.MDB_FOREACH)
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
const PLAN = "plan"
|
const PLAN = "plan"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
Index.Merge(&ice.Context{
|
Index.Merge(&ice.Context{
|
||||||
Commands: map[string]*ice.Command{
|
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 auto insert export import", Help: "计划", Meta: kit.Dict(
|
||||||
"display", "/plugin/local/team/plan.js", "style", "plan",
|
kit.MDB_DISPLAY, "/plugin/local/team/plan.js", kit.MDB_STYLE, PLAN,
|
||||||
), Action: map[string]*ice.Action{
|
), 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) {
|
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) {
|
||||||
_task_create(m, arg[1])
|
_task_create(m, arg[1])
|
||||||
_task_insert(m, arg[1], arg[2:]...)
|
_task_insert(m, arg[1], arg[2:]...)
|
||||||
m.ProcessRefresh("1ms")
|
m.ProcessRefresh("30ms")
|
||||||
}},
|
}},
|
||||||
mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) {
|
mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1])
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1])
|
||||||
@ -31,7 +47,7 @@ func init() {
|
|||||||
}},
|
}},
|
||||||
mdb.IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) {
|
mdb.IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_import(m, "")
|
_task_import(m, "")
|
||||||
m.ProcessRefresh("1ms")
|
m.ProcessRefresh("30ms")
|
||||||
}},
|
}},
|
||||||
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {
|
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
_task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
||||||
@ -39,10 +55,10 @@ func init() {
|
|||||||
|
|
||||||
mdb.PLUGIN: {Name: "plugin extra.ctx extra.cmd extra.arg", Help: "插件", Hand: func(m *ice.Message, arg ...string) {
|
mdb.PLUGIN: {Name: "plugin extra.ctx extra.cmd extra.arg", Help: "插件", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), kit.MDB_TIME, m.Time(), arg...)
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), kit.MDB_TIME, m.Time(), arg...)
|
||||||
m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option("scale"))
|
m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option(SCALE))
|
||||||
}},
|
}},
|
||||||
ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) {
|
ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) {
|
||||||
if arg[0] == "run" {
|
if arg[0] == cli.RUN {
|
||||||
m.Cmdy(arg[1], arg[2:])
|
m.Cmdy(arg[1], arg[2:])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -52,25 +68,14 @@ func init() {
|
|||||||
}},
|
}},
|
||||||
|
|
||||||
gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) {
|
gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.PROCESS)
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), STATUS, PROCESS)
|
||||||
}},
|
}},
|
||||||
gdb.END: {Name: "end", Help: "结束", Hand: func(m *ice.Message, arg ...string) {
|
gdb.END: {Name: "end", Help: "结束", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.FINISH)
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), STATUS, FINISH)
|
||||||
}},
|
}},
|
||||||
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
begin_time, end_time := _task_scope(m, 8, arg...)
|
begin_time, end_time := _task_scope(m, 8, arg...)
|
||||||
m.Option(mdb.CACHE_LIMIT, "100")
|
_plan_list(m, begin_time, end_time)
|
||||||
m.Option(mdb.FIELDS, "begin_time,close_time,zone,id,level,status,score,type,name,text,extra")
|
|
||||||
m.Option(kit.Keycb(mdb.SELECT), func(key string, fields []string, value, val map[string]interface{}) {
|
|
||||||
begin, _ := time.ParseInLocation(ice.MOD_TIME, kit.Format(value[TaskField.BEGIN_TIME]), time.Local)
|
|
||||||
if begin_time.After(begin) || begin.After(end_time) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
m.Push(key, value, fields, val)
|
|
||||||
m.PushButton(_task_action(m, value[TaskField.STATUS], mdb.PLUGIN))
|
|
||||||
})
|
|
||||||
m.Cmd(mdb.SELECT, TASK, "", mdb.ZONE, kit.MDB_FOREACH)
|
|
||||||
|
|
||||||
m.PushPodCmd(PLAN, arg...)
|
m.PushPodCmd(PLAN, arg...)
|
||||||
}},
|
}},
|
||||||
},
|
},
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package team
|
package team
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
ice "github.com/shylinux/icebergs"
|
ice "github.com/shylinux/icebergs"
|
||||||
"github.com/shylinux/icebergs/base/ctx"
|
"github.com/shylinux/icebergs/base/ctx"
|
||||||
"github.com/shylinux/icebergs/base/gdb"
|
"github.com/shylinux/icebergs/base/gdb"
|
||||||
"github.com/shylinux/icebergs/base/mdb"
|
"github.com/shylinux/icebergs/base/mdb"
|
||||||
"github.com/shylinux/icebergs/base/web"
|
"github.com/shylinux/icebergs/base/web"
|
||||||
kit "github.com/shylinux/toolkits"
|
kit "github.com/shylinux/toolkits"
|
||||||
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func _sub_key(m *ice.Message, zone string) string {
|
func _sub_key(m *ice.Message, zone string) string {
|
||||||
@ -26,19 +26,19 @@ func _task_scope(m *ice.Message, tz int, arg ...string) (time.Time, time.Time) {
|
|||||||
begin_time = begin_time.Add(-time.Duration(tz) * time.Hour)
|
begin_time = begin_time.Add(-time.Duration(tz) * time.Hour)
|
||||||
|
|
||||||
end_time := begin_time
|
end_time := begin_time
|
||||||
switch kit.Select("week", arg, 0) {
|
switch kit.Select(WEEK, arg, 0) {
|
||||||
case TaskScale.DAY:
|
case DAY:
|
||||||
end_time = begin_time.AddDate(0, 0, 1)
|
end_time = begin_time.AddDate(0, 0, 1)
|
||||||
case TaskScale.WEEK:
|
case WEEK:
|
||||||
begin_time = begin_time.AddDate(0, 0, -int(begin_time.Weekday()))
|
begin_time = begin_time.AddDate(0, 0, -int(begin_time.Weekday()))
|
||||||
end_time = begin_time.AddDate(0, 0, 7)
|
end_time = begin_time.AddDate(0, 0, 7)
|
||||||
case TaskScale.MONTH:
|
case MONTH:
|
||||||
begin_time = begin_time.AddDate(0, 0, -begin_time.Day()+1)
|
begin_time = begin_time.AddDate(0, 0, -begin_time.Day()+1)
|
||||||
end_time = begin_time.AddDate(0, 1, 0)
|
end_time = begin_time.AddDate(0, 1, 0)
|
||||||
case TaskScale.YEAR:
|
case YEAR:
|
||||||
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1)
|
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1)
|
||||||
end_time = begin_time.AddDate(1, 0, 0)
|
end_time = begin_time.AddDate(1, 0, 0)
|
||||||
case TaskScale.LONG:
|
case LONG:
|
||||||
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1)
|
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1)
|
||||||
begin_time = begin_time.AddDate(-5, 0, 0)
|
begin_time = begin_time.AddDate(-5, 0, 0)
|
||||||
end_time = begin_time.AddDate(10, 0, 0)
|
end_time = begin_time.AddDate(10, 0, 0)
|
||||||
@ -48,24 +48,24 @@ func _task_scope(m *ice.Message, tz int, arg ...string) (time.Time, time.Time) {
|
|||||||
}
|
}
|
||||||
func _task_action(m *ice.Message, status interface{}, action ...string) string {
|
func _task_action(m *ice.Message, status interface{}, action ...string) string {
|
||||||
switch status {
|
switch status {
|
||||||
case TaskStatus.PREPARE:
|
case PREPARE:
|
||||||
action = append(action, gdb.BEGIN)
|
action = append(action, gdb.BEGIN)
|
||||||
case TaskStatus.PROCESS:
|
case PROCESS:
|
||||||
action = append(action, gdb.END)
|
action = append(action, gdb.END)
|
||||||
case TaskStatus.CANCEL:
|
case CANCEL:
|
||||||
case TaskStatus.FINISH:
|
case FINISH:
|
||||||
}
|
}
|
||||||
return strings.Join(action, ",")
|
return strings.Join(action, ",")
|
||||||
}
|
}
|
||||||
|
|
||||||
func _task_list(m *ice.Message, zone string, id string) *ice.Message {
|
func _task_list(m *ice.Message, zone string, id string) *ice.Message {
|
||||||
if zone == "" {
|
if zone == "" {
|
||||||
m.Option(mdb.FIELDS, "time,zone,count")
|
m.Fields(zone == "", "time,zone,count")
|
||||||
defer func() { m.PushAction(mdb.REMOVE) }()
|
defer func() { m.PushAction(mdb.REMOVE) }()
|
||||||
} else {
|
} else {
|
||||||
m.Option(mdb.FIELDS, kit.Select("begin_time,id,status,level,score,type,name,text", mdb.DETAIL, id != ""))
|
m.Fields(id == "", "begin_time,id,status,level,score,type,name,text")
|
||||||
defer m.Table(func(index int, value map[string]string, head []string) {
|
defer m.Table(func(index int, value map[string]string, head []string) {
|
||||||
m.PushButton(_task_action(m, value[TaskField.STATUS]))
|
m.PushButton(_task_action(m, value[STATUS]))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return m.Cmdy(mdb.SELECT, TASK, "", mdb.ZONE, zone, id)
|
return m.Cmdy(mdb.SELECT, TASK, "", mdb.ZONE, zone, id)
|
||||||
@ -75,24 +75,22 @@ func _task_create(m *ice.Message, zone string) {
|
|||||||
}
|
}
|
||||||
func _task_insert(m *ice.Message, zone string, arg ...string) {
|
func _task_insert(m *ice.Message, zone string, arg ...string) {
|
||||||
m.Cmdy(mdb.INSERT, TASK, _sub_key(m, zone), mdb.LIST,
|
m.Cmdy(mdb.INSERT, TASK, _sub_key(m, zone), mdb.LIST,
|
||||||
TaskField.BEGIN_TIME, m.Time(), TaskField.CLOSE_TIME, m.Time("30m"),
|
BEGIN_TIME, m.Time(), CLOSE_TIME, m.Time("30m"),
|
||||||
TaskField.STATUS, TaskStatus.PREPARE, TaskField.LEVEL, 3, TaskField.SCORE, 3,
|
STATUS, PREPARE, LEVEL, 3, SCORE, 3, arg)
|
||||||
arg,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
func _task_modify(m *ice.Message, zone, id, field, value string, arg ...string) {
|
func _task_modify(m *ice.Message, zone, id, field, value string, arg ...string) {
|
||||||
if field == TaskField.STATUS {
|
if field == STATUS {
|
||||||
switch value {
|
switch value {
|
||||||
case TaskStatus.PROCESS:
|
case PROCESS:
|
||||||
arg = append(arg, TaskField.BEGIN_TIME, m.Time())
|
arg = append(arg, BEGIN_TIME, m.Time())
|
||||||
case TaskStatus.CANCEL, TaskStatus.FINISH:
|
case CANCEL, FINISH:
|
||||||
arg = append(arg, TaskField.CLOSE_TIME, m.Time())
|
arg = append(arg, CLOSE_TIME, m.Time())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, field, value, arg)
|
m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, field, value, arg)
|
||||||
}
|
}
|
||||||
func _task_delete(m *ice.Message, zone, id string) {
|
func _task_delete(m *ice.Message, zone, id string) {
|
||||||
m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, TaskField.STATUS, TaskStatus.CANCEL)
|
m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, STATUS, CANCEL)
|
||||||
}
|
}
|
||||||
func _task_remove(m *ice.Message, zone string) {
|
func _task_remove(m *ice.Message, zone string) {
|
||||||
m.Cmdy(mdb.DELETE, TASK, "", mdb.HASH, kit.MDB_ZONE, zone)
|
m.Cmdy(mdb.DELETE, TASK, "", mdb.HASH, kit.MDB_ZONE, zone)
|
||||||
@ -131,10 +129,6 @@ func _task_inputs(m *ice.Message, field, value string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
func _task_search(m *ice.Message, kind, name, text string) {
|
func _task_search(m *ice.Message, kind, name, text string) {
|
||||||
if kind != TASK && kind != kit.MDB_FOREACH {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Cmd(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, kit.MDB_FOREACH, func(key string, value map[string]interface{}, val map[string]interface{}) {
|
m.Cmd(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, kit.MDB_FOREACH, func(key string, value map[string]interface{}, val map[string]interface{}) {
|
||||||
if name != "" && !kit.Contains(value[kit.MDB_NAME], name) {
|
if name != "" && !kit.Contains(value[kit.MDB_NAME], name) {
|
||||||
return
|
return
|
||||||
@ -152,32 +146,32 @@ func _task_search(m *ice.Message, kind, name, text string) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
var TaskField = struct{ LEVEL, STATUS, SCORE, BEGIN_TIME, CLOSE_TIME string }{
|
const ( // type
|
||||||
LEVEL: "level",
|
ONCE = "once"
|
||||||
STATUS: "status",
|
STEP = "step"
|
||||||
SCORE: "score",
|
)
|
||||||
|
const ( // scale
|
||||||
|
DAY = "day"
|
||||||
|
WEEK = "week"
|
||||||
|
MONTH = "month"
|
||||||
|
YEAR = "year"
|
||||||
|
LONG = "long"
|
||||||
|
)
|
||||||
|
const ( // status
|
||||||
|
PREPARE = "prepare"
|
||||||
|
PROCESS = "process"
|
||||||
|
CANCEL = "cancel"
|
||||||
|
FINISH = "finish"
|
||||||
|
)
|
||||||
|
const ( // key
|
||||||
|
SCALE = "scale"
|
||||||
|
LEVEL = "level"
|
||||||
|
STATUS = "status"
|
||||||
|
SCORE = "score"
|
||||||
|
|
||||||
BEGIN_TIME: "begin_time",
|
BEGIN_TIME = "begin_time"
|
||||||
CLOSE_TIME: "close_time",
|
CLOSE_TIME = "close_time"
|
||||||
}
|
)
|
||||||
var TaskStatus = struct{ PREPARE, PROCESS, CANCEL, FINISH string }{
|
|
||||||
PREPARE: "prepare",
|
|
||||||
PROCESS: "process",
|
|
||||||
CANCEL: "cancel",
|
|
||||||
FINISH: "finish",
|
|
||||||
}
|
|
||||||
var TaskType = struct{ ONCE, STEP, WEEK string }{
|
|
||||||
ONCE: "once",
|
|
||||||
STEP: "step",
|
|
||||||
WEEK: "week",
|
|
||||||
}
|
|
||||||
var TaskScale = struct{ DAY, WEEK, MONTH, YEAR, LONG string }{
|
|
||||||
DAY: "day",
|
|
||||||
WEEK: "week",
|
|
||||||
MONTH: "month",
|
|
||||||
YEAR: "year",
|
|
||||||
LONG: "long",
|
|
||||||
}
|
|
||||||
|
|
||||||
const TASK = "task"
|
const TASK = "task"
|
||||||
|
|
||||||
@ -211,21 +205,19 @@ func init() {
|
|||||||
_task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
_task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
||||||
}},
|
}},
|
||||||
mdb.SEARCH: {Name: "search", Help: "搜索", Hand: func(m *ice.Message, arg ...string) {
|
mdb.SEARCH: {Name: "search", Help: "搜索", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_search(m, arg[0], arg[1], arg[2])
|
if arg[0] == TASK || arg[0] == kit.MDB_FOREACH {
|
||||||
m.PushPodCmd(TASK, kit.Simple(mdb.SEARCH, arg)...)
|
_task_search(m, arg[0], arg[1], arg[2])
|
||||||
|
m.PushPodCmd(TASK, kit.Simple(mdb.SEARCH, arg)...)
|
||||||
|
}
|
||||||
}},
|
}},
|
||||||
|
|
||||||
gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) {
|
gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.PROCESS)
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), STATUS, PROCESS)
|
||||||
}},
|
}},
|
||||||
gdb.END: {Name: "end", Help: "完成", Hand: func(m *ice.Message, arg ...string) {
|
gdb.END: {Name: "end", Help: "完成", Hand: func(m *ice.Message, arg ...string) {
|
||||||
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.FINISH)
|
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), STATUS, FINISH)
|
||||||
}},
|
}},
|
||||||
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
if m.Option(kit.SSH_POD) != "" {
|
|
||||||
m.Cmdy(web.SPACE, m.Option(kit.SSH_POD), m.Prefix(TASK), arg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_task_list(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
_task_list(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
|
||||||
}},
|
}},
|
||||||
},
|
},
|
||||||
|
@ -14,7 +14,9 @@ var Index = &ice.Context{Name: TEAM, Help: "团队中心",
|
|||||||
m.Cmd(mdb.SEARCH, mdb.CREATE, TASK, m.Prefix(TASK))
|
m.Cmd(mdb.SEARCH, mdb.CREATE, TASK, m.Prefix(TASK))
|
||||||
m.Load()
|
m.Load()
|
||||||
}},
|
}},
|
||||||
ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }},
|
ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
|
||||||
|
m.Save()
|
||||||
|
}},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
3
misc.go
3
misc.go
@ -146,6 +146,9 @@ func Render(m *Message, cmd string, args ...interface{}) string {
|
|||||||
return fmt.Sprintf(`<a href="%s" target="_blank">%s</a>`, kit.Select(arg[0], arg, 1), arg[0])
|
return fmt.Sprintf(`<a href="%s" target="_blank">%s</a>`, kit.Select(arg[0], arg, 1), arg[0])
|
||||||
|
|
||||||
case RENDER_BUTTON: // name...
|
case RENDER_BUTTON: // name...
|
||||||
|
if m._cmd == nil || m._cmd.Meta == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
list := []string{}
|
list := []string{}
|
||||||
for _, k := range kit.Split(strings.Join(arg, ",")) {
|
for _, k := range kit.Split(strings.Join(arg, ",")) {
|
||||||
list = append(list, fmt.Sprintf(`<input type="button" name="%s" value="%s">`,
|
list = append(list, fmt.Sprintf(`<input type="button" name="%s" value="%s">`,
|
||||||
|
12
type.go
12
type.go
@ -532,10 +532,12 @@ func (m *Message) Travel(cb interface{}) *Message {
|
|||||||
}
|
}
|
||||||
sort.Strings(ls)
|
sort.Strings(ls)
|
||||||
|
|
||||||
for _, k := range ls {
|
target := m.target
|
||||||
// 遍历命令
|
for _, k := range ls { // 命令列表
|
||||||
|
m.target = list[i]
|
||||||
cb(list[i].context, list[i], k, list[i].Commands[k])
|
cb(list[i].context, list[i], k, list[i].Commands[k])
|
||||||
}
|
}
|
||||||
|
m.target = target
|
||||||
case func(*Context, *Context, string, *Config):
|
case func(*Context, *Context, string, *Config):
|
||||||
ls := []string{}
|
ls := []string{}
|
||||||
for k := range list[i].Configs {
|
for k := range list[i].Configs {
|
||||||
@ -543,8 +545,7 @@ func (m *Message) Travel(cb interface{}) *Message {
|
|||||||
}
|
}
|
||||||
sort.Strings(ls)
|
sort.Strings(ls)
|
||||||
|
|
||||||
for _, k := range ls {
|
for _, k := range ls { // 配置列表
|
||||||
// 遍历配置
|
|
||||||
cb(list[i].context, list[i], k, list[i].Configs[k])
|
cb(list[i].context, list[i], k, list[i].Configs[k])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -555,8 +556,7 @@ func (m *Message) Travel(cb interface{}) *Message {
|
|||||||
}
|
}
|
||||||
sort.Strings(ls)
|
sort.Strings(ls)
|
||||||
|
|
||||||
// 遍历递进
|
for _, k := range ls { // 遍历递进
|
||||||
for _, k := range ls {
|
|
||||||
list = append(list, list[i].contexts[k])
|
list = append(list, list[i].contexts[k])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user