diff --git a/src/gonganxitong/allow.go b/src/gonganxitong/allow.go index 8b587b9..b506f10 100644 --- a/src/gonganxitong/allow.go +++ b/src/gonganxitong/allow.go @@ -20,14 +20,6 @@ type allow struct { approve string `name:"approve" role:"void"` } -func (s Table) placeInfo(m *ice.Message) { - msg := m.Cmd(s.Place, s.Select, model.UID, m.Option(s.Keys(s.Place, model.UID))) - s.SelectJoin(msg, s.Street, model.NAME, model.CITY_UID) - s.SelectJoinCity(msg) - m.Option(model.CITY_NAME, msg.Append(model.CITY_NAME)) - m.Option(model.STREET_NAME, msg.Append(s.Keys(s.Street, model.NAME))) - m.Option(model.PLACE_NAME, msg.Append(model.NAME)) -} func (s allow) Create(m *ice.Message, arg ...string) { s.Insert(m.Spawn(), arg...) s.GetCommandUID(m) diff --git a/src/gonganxitong/apply.go b/src/gonganxitong/apply.go index 1ef617c..f6e7208 100644 --- a/src/gonganxitong/apply.go +++ b/src/gonganxitong/apply.go @@ -83,7 +83,7 @@ func (s apply) Submit(m *ice.Message, arg ...string) { if m.WarnNotFound(msg.Length() == 0, role.String()) { return } - s.placeInfo(m) + s.PlaceInfo(m) m.Option(model.FROM_USER_UID, m.Option(model.USER_UID)) m.Cmd(s.Prefix(m, allow{}), s.Create, model.APPLY_UID, m.Option(model.UID), model.PLACE_UID, m.Option(s.Keys(s.Place, model.UID)), msg.AppendSimple(model.USER_UID), model.STATUS, AllowCreate) s.RecordEvent(m, kit.JoinWord("πŸ•‘", m.Trans("role apply submit", "权限申请 已提亀"), kit.Cut(m.Option(model.UID), 6), s.TransRole(m), m.Option(model.USER_NAME)), m.Option(model.UID)) diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 93aba03..bba594c 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -229,6 +229,9 @@ func (s Table) IsLeader(m *ice.Message) bool { } return false } +func (s Table) PlaceInfo(m *ice.Message) { + m.Cmdy(s.Prefix(m, Portal{}), s.PlaceInfo) +} func (s Table) UserPlaceRole(m *ice.Message) int { return kit.Int(m.Cmdx(s.Prefix(m, Portal{}), s.UserPlaceRole)) } diff --git a/src/gonganxitong/message.js b/src/gonganxitong/message.js index 9f2bc12..83d6382 100644 --- a/src/gonganxitong/message.js +++ b/src/gonganxitong/message.js @@ -14,7 +14,4 @@ Volcanos(chat.ONIMPORT, { ] }) }, - layout: function(can) { - can.ui.list && can.page.styleHeight(can, can.ui.list, can.ConfHeight()-can.ui.tabs.offsetHeight) - }, }) diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index 18e4e7d..bbb3e6f 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -181,6 +181,14 @@ func (s Portal) PlaceList(m *ice.Message, arg ...string) *ice.Message { s.SelectJoinAuth(m) return m } +func (s Portal) PlaceInfo(m *ice.Message, arg ...string) { + msg := m.Cmd(s.Place, s.Table.Select, model.UID, m.Option(s.Keys(s.Place, model.UID))) + s.SelectJoin(msg, s.Street, model.NAME, model.CITY_UID) + s.SelectJoinCity(msg) + m.Option(model.CITY_NAME, msg.Append(model.CITY_NAME)) + m.Option(model.STREET_NAME, msg.Append(s.Keys(s.Street, model.NAME))) + m.Option(model.PLACE_NAME, msg.Append(model.NAME)) +} func (s Portal) PlaceAuth(m *ice.Message, arg ...string) { if m.Option(model.AUTH_UID) == "" { place_uid := m.Option(s.Keys(s.Place, model.UID)) diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 66895a1..d75a6f7 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -1,6 +1,8 @@ var UID = "uid", PLACE_UID = "place_uid", PLACE_NAME = "place_name", PLACE_TYPE = "place_type", STREET_NAME = "street_name", CITY_NAME = "city_name" Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { can.onappend.style(can, html.OUTPUT), can.onimport.myPortal(can, msg) }, + _init: function(can, msg) { + can.onappend.style(can, html.OUTPUT), can.onimport.myPortal(can, msg) + }, myValue: function(can, value) { return [ {view: html.TITLE, list: [value._name, can.onimport.authView(can, value), {text: [value.__type, "", [mdb.TYPE, value._type, value._type_style]]}, value._role != "visitor" && {text: [value.__role, "", [aaa.ROLE, value._role, value._role_style]]}, @@ -135,8 +137,6 @@ Volcanos(chat.ONIMPORT, { can.onmotion.delay(can, function() { can.onimport.layout(can) }, 300) }, myDebug: function(can, msg, target) { - can.onmotion.hidden(can, target) - return can.onimport.myTitle(can, "My Debug", "ζˆ‘ηš„θ°ƒθ―•", target) can.page.Append(can, target, [ {text: ""+window.innerHeight+"\n"}, @@ -152,10 +152,8 @@ Volcanos(chat.ONIMPORT, { }) Volcanos(chat.ONACTION, { beforeInputs: function(event, can, button, sub) { - can._root.Inputs.appendChild(sub._target) + can.user.isMobile && can._root.Inputs.appendChild(sub._target) can.user.isMobile && can.page.style(can, can._root.Action._output, html.VISIBILITY, html.HIDDEN) - // can.page.insertBefore(can, sub._target, can._root.Action._output) - // can.user.isMobile && can.onmotion.toggle(can, can._root.Action._output, false) sub.Option("city_name", "ζ·±εœ³εΈ‚") sub.Option("street_name", "θˆͺεŸŽθ‘—ι“") sub.Option("company_name", "云咃互联") @@ -165,7 +163,6 @@ Volcanos(chat.ONACTION, { }, afterInputs: function(event, can, button, target) { can.user.isMobile && can.page.style(can, can._root.Action._output, html.VISIBILITY, "") - // can.user.isMobile && can.onmotion.toggle(can, can._root.Action._output, true) }, }) Volcanos(chat.ONEXPORT, { diff --git a/src/gonganxitong/service.js b/src/gonganxitong/service.js index cf99edd..93969c7 100644 --- a/src/gonganxitong/service.js +++ b/src/gonganxitong/service.js @@ -1,11 +1,12 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - can.onimport.myView(can, msg, function(value) { value.icon = value.icon.split("?")[0]; return [ - {view: html.TITLE, list: [value.name, can.onimport.textView(can, value, "service_type"), can.onimport.textView(can, value, "service_status")]}, + can.onimport.myView(can, msg, function(value) { value.icon = value.icon.split("?")[0]; return value.service_status == "online" && [ + // {view: html.TITLE, list: [value.name, can.onimport.textView(can, value, "service_type"), can.onimport.textView(can, value, "service_status")]}, + {view: html.TITLE, list: [value.name]}, {view: html.STATUS, list: [value.index]}, {view: html.STATUS, list: [value.module, value.version]}, ] }, function(event, value) { can.onaction._goback(can) can.onimport.myPlugin(can, {space: value.space||value.nodename, index: value.index}) }) }, -}) +}) \ No newline at end of file