diff --git a/etc/init.shy b/etc/init.shy index 6de1689..dcf310b 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -1,2 +1,5 @@ ~ssh source local.shy +~web.chat.macos + desktop create index web.team.gonganxitong.recent name recent icon "https://img.icons8.com/officel/80/activity-grid.png" + desktop create index web.team.gonganxitong.service name service icon "https://img.icons8.com/officel/80/activity-grid.png" diff --git a/src/gonganxitong/recent.go b/src/gonganxitong/recent.go index 8f7504c..f040529 100644 --- a/src/gonganxitong/recent.go +++ b/src/gonganxitong/recent.go @@ -51,7 +51,13 @@ func (s recent) List(m *ice.Message, arg ...string) { s.DisplayBase(m, "") } func (s recent) Open(m *ice.Message, arg ...string) { - m.ProcessOpen(web.S(m.Option(web.SPACE)) + web.C(m.Option(ctx.INDEX)) + "#" + kit.Join(kit.Split(m.Option(ctx.ARGS)), ":")) + m.Option("style", "portal") + m.Option(model.TITLE, m.Option(model.PLACE_NAME)) + m.Option(ice.MSG_USERPOD, m.Option(web.SPACE)) + m.ProcessOpen(m.Cmdx(m.Option("index"), s.Link, m.Option(model.PLACE_UID))) + return + m.ProcessOpen(web.S(m.Option(web.SPACE)) + web.C(m.Option(ctx.INDEX)) + "?" + s.Keys(s.Place, model.UID) + "=" + m.Option("place_uid") + "#" + kit.Join(kit.Split(m.Option(ctx.ARGS)), ":")) + m.ProcessOpen(web.S(m.Option(web.SPACE)) + web.C(m.Option(ctx.INDEX)) + "?" + s.Keys(s.Place, model.UID) + "=" + m.Option("place_uid") + "#" + kit.Join(kit.Split(m.Option(ctx.ARGS)), ":")) } func (s recent) Sticky(m *ice.Message, arg ...string) { s.Update(m, ice.Map{model.SCORE: 100}, m.OptionSimple(model.USER_UID, model.UID)...) diff --git a/src/gonganxitong/recent.js b/src/gonganxitong/recent.js index cfaaa62..250a4fb 100644 --- a/src/gonganxitong/recent.js +++ b/src/gonganxitong/recent.js @@ -1,15 +1,15 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { value._style = []; if (value.score > 0) { value._style = ["sticky"] } - if (can._stacks_root._stacks[[value.space,value.index, value.place_uid].join(",")]) { value._style.push("loaded") } + if (can._stacks_root && can._stacks_root._stacks[[value.space,value.index, value.place_uid].join(",")]) { value._style.push("loaded") } value.icons = can.misc.Resource(can, value.service_icon.split("?")[0], value.space) return [ {view: html.TITLE, list: [value.place_name, can.onimport.authView(can, value), can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.city_name, value.street_name, value.service_name]}, ] - }, function(event, value) { can.onaction._goback(event, function() { + }, function(event, value) { can.onaction._goback? can.onaction._goback(event, function() { // can.onimport.myPlugin(can, {space: value.space, index: value.index, args: [value.place_uid]}) can.onimport.myStory(can, {space: value.space, index: value.index, args: [value.place_uid]}) - }) }) + }): can.runAction(can.request(event, value, {args: value.place_uid}), web.OPEN, []) }) }, }) diff --git a/src/gonganxitong/service.go b/src/gonganxitong/service.go index 5cf1a12..367041b 100644 --- a/src/gonganxitong/service.go +++ b/src/gonganxitong/service.go @@ -154,6 +154,8 @@ func (s service) name(m *ice.Message) string { return kit.Select("", strings.Split(m.Option(ctx.INDEX), "."), -2) } func (s service) spaceOpen(m *ice.Message, index string, arg ...ice.Any) { + m.Option("style", "portal") + m.Option(model.TITLE, m.Option(model.NAME)) m.ProcessOpen(kit.MergeURL(web.S(m.Option(web.SPACE))+web.C(index), arg...)) } diff --git a/src/gonganxitong/service.js b/src/gonganxitong/service.js index 8051b13..7b33dc4 100644 --- a/src/gonganxitong/service.js +++ b/src/gonganxitong/service.js @@ -8,9 +8,9 @@ Volcanos(chat.ONIMPORT, { {view: html.STATUS, list: [value.index]}, {view: html.STATUS, list: [value.module, value.version]}, ] - }, function(event, value) { can.onaction._goback(event, function() { + }, function(event, value) { can.onaction._goback? can.onaction._goback(event, function() { // can.onimport.myPlugin(can, {space: value.space, index: value.index}) can.onimport.myStory(can, {space: value.space, index: value.index}) - }) }) + }): can.runAction(can.request(event, value, {args: value.place_uid}), web.OPEN, []) }) }, }) \ No newline at end of file diff --git a/src/gonganxitong/user.go b/src/gonganxitong/user.go index 647ceed..0ef1fba 100644 --- a/src/gonganxitong/user.go +++ b/src/gonganxitong/user.go @@ -46,7 +46,7 @@ func (s user) Remove(m *ice.Message, arg ...string) { func (s user) List(m *ice.Message, arg ...string) { if len(arg) == 0 { if m.IsTech() { - s.Limit(m, 300) + s.Limit(m, 3000) s.Select(m, arg...).Table(func(value ice.Maps) { if value[model.UID] != m.Option(model.USER_UID) { m.PushButton(s.SetCookie)