From ad20ca96fcdf1dab30b2ae2d60ac053afc257a6f Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 3 Feb 2021 19:52:18 +0800 Subject: [PATCH] opt wiki --- core/chat/chat.go | 38 +++++---- core/chat/chat.shy | 17 ++++ core/chat/file.go | 39 ---------- core/chat/header.go | 15 ++-- core/wiki/draw.go | 2 +- core/wiki/template.go | 58 +++++++------- core/wiki/wiki.go | 7 +- core/wiki/wiki.shy | 14 ++-- core/wiki/word.go | 175 +++++++++++++++++++----------------------- 9 files changed, 163 insertions(+), 202 deletions(-) delete mode 100644 core/chat/file.go diff --git a/core/chat/chat.go b/core/chat/chat.go index 1f3a3767..6c3be0c5 100644 --- a/core/chat/chat.go +++ b/core/chat/chat.go @@ -13,24 +13,30 @@ const CHAT = "chat" var Index = &ice.Context{Name: CHAT, Help: "聊天中心", Commands: map[string]*ice.Command{ ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Cmd(web.SERVE, aaa.WHITE, HEADER, RIVER, ACTION, FOOTER) m.Cmd(mdb.SEARCH, mdb.CREATE, P_SEARCH, m.Prefix(P_SEARCH)) m.Cmd(mdb.SEARCH, mdb.CREATE, EMAIL, m.Prefix(EMAIL)) + m.Watch(web.SPACE_START, m.Prefix(NODE)) + m.Watch(web.SPACE_STOP, m.Prefix(NODE)) m.Load() - m.Cmd(web.SERVE, aaa.WHITE, "header", "river", "action", "footer") - m.Conf(ACTION, "meta.domain.web.chat.meet.miss", "true") - m.Conf(ACTION, "meta.domain.web.chat.meet.mate", "true") - m.Conf(ACTION, "meta.domain.web.chat.location", "true") - m.Conf(ACTION, "meta.domain.web.chat.paste", "true") - m.Conf(ACTION, "meta.domain.web.chat.scan", "true") - m.Conf(ACTION, "meta.domain.web.wiki.feel", "true") - m.Conf(ACTION, "meta.domain.web.wiki.draw", "true") - m.Conf(ACTION, "meta.domain.web.wiki.data", "true") - m.Conf(ACTION, "meta.domain.web.wiki.word", "true") - m.Conf(ACTION, "meta.domain.web.team.task", "true") - m.Conf(ACTION, "meta.domain.web.team.plan", "true") - m.Conf(ACTION, "meta.domain.web.mall.asset", "true") - m.Conf(ACTION, "meta.domain.web.mall.salary", "true") + for _, cmd := range []string{ + "web.chat.meet.miss", + "web.chat.meet.mate", + "web.chat.location", + "web.chat.paste", + "web.chat.scan", + "web.wiki.feel", + "web.wiki.draw", + "web.wiki.data", + "web.wiki.word", + "web.team.task", + "web.team.plan", + "web.mall.asset", + "web.mall.salary", + } { + m.Conf(ACTION, kit.Keym("domain", cmd), "true") + } m.Conf(RIVER, "meta.template", kit.Dict( "base", kit.Dict( @@ -62,8 +68,6 @@ var Index = &ice.Context{Name: CHAT, Help: "聊天中心", }, ), )) - m.Watch(web.SPACE_START, m.Prefix(NODE)) - m.Watch(web.SPACE_STOP, m.Prefix(NODE)) }}, ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, }, @@ -72,6 +76,6 @@ var Index = &ice.Context{Name: CHAT, Help: "聊天中心", func init() { web.Index.Register(Index, &web.Frame{}, HEADER, RIVER, STORM, ACTION, FOOTER, - LOCATION, PASTE, SCAN, FILES, + SCAN, PASTE, FILES, LOCATION, ) } diff --git a/core/chat/chat.shy b/core/chat/chat.shy index 041f408a..0682d0f1 100644 --- a/core/chat/chat.shy +++ b/core/chat/chat.shy @@ -1,2 +1,19 @@ chapter "组织" +chat.go +chat.shy + +header.go +search.go +river.go +action.go +footer.go + +scan.go +paste.go +files.go +location.go +study.go +email.go +meet.go + diff --git a/core/chat/file.go b/core/chat/file.go deleted file mode 100644 index 7fe505cd..00000000 --- a/core/chat/file.go +++ /dev/null @@ -1,39 +0,0 @@ -package chat - -import ( - ice "github.com/shylinux/icebergs" - "github.com/shylinux/icebergs/base/mdb" - "github.com/shylinux/icebergs/base/web" - kit "github.com/shylinux/toolkits" -) - -const FILES = "files" - -func init() { - Index.Merge(&ice.Context{ - Configs: map[string]*ice.Config{ - FILES: {Name: FILES, Help: "文件", Value: kit.Data(kit.MDB_SHORT, "data")}, - }, - Commands: map[string]*ice.Command{ - FILES: {Name: "files hash auto upload", Help: "扫码", Action: map[string]*ice.Action{ - web.UPLOAD: {Name: "upload", Help: "上传", Hand: func(m *ice.Message, arg ...string) { - up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)) - m.Cmdy(mdb.INSERT, FILES, "", mdb.HASH, "data", up[0], kit.MDB_NAME, up[1]) - }}, - mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.DELETE, FILES, "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH)) - }}, - }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Option(mdb.FIELDS, kit.Select("time,hash,name,data", mdb.DETAIL, len(arg) > 0)) - m.Cmdy(mdb.SELECT, FILES, "", mdb.HASH, "hash", arg) - m.Table(func(index int, value map[string]string, head []string) { - m.PushDownload(value[kit.MDB_NAME], "/share/cache/"+value["data"]) - }) - if len(arg) == 0 { - m.SortTimeR(kit.MDB_TIME) - } - m.PushAction(mdb.REMOVE) - }}, - }, - }) -} diff --git a/core/chat/header.go b/core/chat/header.go index 34b64733..baf8ef9c 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -3,7 +3,9 @@ package chat import ( ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/aaa" + "github.com/shylinux/icebergs/base/mdb" "github.com/shylinux/icebergs/base/web" + "github.com/shylinux/icebergs/core/code" kit "github.com/shylinux/toolkits" ) @@ -11,6 +13,8 @@ const ( TITLE = "title" LOGIN = "login" CHECK = "check" + + BACKGROUND = "background" ) const HEADER = "header" @@ -46,18 +50,17 @@ func init() { aaa.USERROLE: {Name: "userrole", Help: "用户角色", Hand: func(m *ice.Message, arg ...string) { m.Echo(aaa.UserRole(m, m.Option("who"))) }}, - - "background": {Name: "background", Help: "背景图片", Hand: func(m *ice.Message, arg ...string) { - m.Option("background", m.Conf(HEADER, "background", arg[0])) + BACKGROUND: {Name: "background", Help: "背景图片", Hand: func(m *ice.Message, arg ...string) { + m.Option(BACKGROUND, m.Conf(HEADER, BACKGROUND, arg[0])) }}, - "pack": {Name: "pack", Help: "打包", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy("web.code.webpack", "create") + code.WEBPACK: {Name: "webpack", Help: "打包", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(code.WEBPACK, mdb.CREATE) }}, "wx": {Name: "wx", Help: "微信", Hand: func(m *ice.Message, arg ...string) { m.Cmdy("web.chat.wx.access", "config") }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Option("background", m.Conf(HEADER, "background")) + m.Option(BACKGROUND, m.Conf(HEADER, BACKGROUND)) m.Echo(m.Conf(HEADER, TITLE)) }}, }, diff --git a/core/wiki/draw.go b/core/wiki/draw.go index d186c7e6..c75aa56e 100644 --- a/core/wiki/draw.go +++ b/core/wiki/draw.go @@ -17,7 +17,7 @@ func init() { }, Commands: map[string]*ice.Command{ DRAW: {Name: "draw path=src/ file=main.svg 刷新:button=auto 编辑 save 项目 参数", Help: "思维导图", Meta: kit.Dict( - "display", "/plugin/local/wiki/draw.js", "style", "drawer", + "display", "/plugin/local/wiki/draw.js", ), Action: map[string]*ice.Action{ nfs.SAVE: {Name: "save", Help: "保存", Hand: func(m *ice.Message, arg ...string) { _wiki_save(m, DRAW, path.Join(arg...), m.Option("content")) diff --git a/core/wiki/template.go b/core/wiki/template.go index 37facdb7..d931f2f9 100644 --- a/core/wiki/template.go +++ b/core/wiki/template.go @@ -9,18 +9,42 @@ var title = `<{{.Option "level"}} class="story" {{range $k, $v := .Optionv "extra"}}data-{{$k}}='{{$v}}'{{end}} data-type="{{.Option "type"}}" >{{.Option "prefix"}} {{.Option "content"}}` - var brief = `

{{.Option "text"}}

` - var refer = `` var spark = `

{{.Option "text"}}

` +var order = `` +var table = ` +{{range $i, $v := .Optionv "head"}}{{end}} +{{range $index, $value := .Optionv "list"}} +{{range $i, $v := $value}}{{end}} +{{end}} +
{{$v}}
{{$v}}
` +var shell = `$ {{.Option "input"}} # {{.Option "name"}} +{{.Option "output"}}` +var local = `{{range $index, $value := .Optionv "input"}}{{$value}}{{end}}` + +var image = `` var chart = ` ` -var shell = `$ {{.Option "input"}} # {{.Option "name"}} -{{.Option "output"}} -` -var local = `{{range $index, $value := .Optionv "input"}}{{$value}}{{end}}` - -var order = `` - -var table = ` -{{range $i, $v := .Optionv "head"}}{{end}} -{{range $index, $value := .Optionv "list"}} -{{range $i, $v := $value}}{{end}} -{{end}} -
{{$v}}
{{$v}}
` - -var image = `` +var other = `` var video = `