From a6af733c9d7d1e4291ed153e4f73b63fbb61e929 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sun, 22 Aug 2021 06:47:22 +0800 Subject: [PATCH] opt chat.div --- base/mdb/hash.go | 13 ++++++++++++- core/chat/div.go | 7 +++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/base/mdb/hash.go b/base/mdb/hash.go index bc1e08c8..6df9ff83 100644 --- a/base/mdb/hash.go +++ b/base/mdb/hash.go @@ -154,6 +154,17 @@ func selectAction(list map[string]*ice.Action, fields ...string) map[string]*ice } return res } +func CmdAction(fields ...string) map[string]*ice.Action { + return selectAction(map[string]*ice.Action{ + "command": {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy("command", arg) + }}, + "run": {Name: "run", Help: "执行", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(arg) + }}, + }, fields...) +} + func HashAction(fields ...string) map[string]*ice.Action { return selectAction(map[string]*ice.Action{ CREATE: {Name: "create type name text", Help: "创建", Hand: func(m *ice.Message, arg ...string) { @@ -186,7 +197,7 @@ func HashAction(fields ...string) map[string]*ice.Action { INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(INPUTS, m.PrefixKey(), "", HASH, arg) }}, - }) + }, fields...) } const HASH = "hash" diff --git a/core/chat/div.go b/core/chat/div.go index 75c1428e..80a8621b 100644 --- a/core/chat/div.go +++ b/core/chat/div.go @@ -20,12 +20,12 @@ func init() { kit.MDB_PATH, ice.USR_PUBLISH, )}, }, Commands: map[string]*ice.Command{ - DIV: {Name: "div hash auto create", Help: "定制", Action: ice.MergeAction(map[string]*ice.Action{ + DIV: {Name: "div hash auto", Help: "定制", Action: ice.MergeAction(map[string]*ice.Action{ mdb.CREATE: {Name: "create type=page name=hi.html text", Help: "创建"}, cli.MAKE: {Name: "make", Help: "生成", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(nfs.SAVE, path.Join(m.Conf(DIV, kit.META_PATH), m.Option(kit.MDB_NAME)), m.Option(kit.MDB_TEXT)) }}, - }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction(), mdb.CmdAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(DIV, kit.META_FIELD)) m.Cmdy(mdb.SELECT, m.PrefixKey(), "", mdb.HASH, kit.MDB_HASH, arg) m.Table(func(index int, value map[string]string, head []string) { @@ -33,6 +33,9 @@ func init() { }) if m.PushAction(cli.MAKE, mdb.REMOVE); len(arg) > 0 { m.Option(ice.MSG_DISPLAY, "/plugin/local/chat/div.js") + m.Action("添加", "保存", "预览") + } else { + m.Action(mdb.CREATE) } }}, "/div": {Name: "/div", Help: "定制", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {