diff --git a/src/gonganxitong/apply.go b/src/gonganxitong/apply.go index 04bb7b9..39daa8a 100644 --- a/src/gonganxitong/apply.go +++ b/src/gonganxitong/apply.go @@ -23,7 +23,7 @@ func (s apply) Init(m *ice.Message, arg ...string) { s.Table.Init(m, arg...) place_uid, user_place_role := s.Keys(s.Place, model.UID), s.Keys(s.UserPlace, model.ROLE) m.Design(s.Create, "", user_place_role+"*:select") - m.Design(s.List, "", place_uid+" uid auto") + m.Design(s.List, "", kit.JoinWord(place_uid, model.UID, ice.AUTO)) } func (s apply) Inputs(m *ice.Message, arg ...string) { s.UserPlace.Inputs(m, arg...) @@ -43,7 +43,7 @@ func (s apply) List(m *ice.Message, arg ...string) { ) if len(arg) == 1 { s.Table.Select(m, model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, arg[0]) - kit.If(m.Length() == 0, func() { m.EchoInfoButton("") }) + s.Button(m, "") } else if len(arg) == 2 { s.Table.SelectDetail(m, model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, arg[0], s.Key(s, model.UID), arg[1]) switch ApplyStatus(kit.Int(m.Append(model.APPLY_STATUS))) { diff --git a/src/gonganxitong/apply.js b/src/gonganxitong/apply.js index 95a10aa..9e7cd5f 100644 --- a/src/gonganxitong/apply.js +++ b/src/gonganxitong/apply.js @@ -1,5 +1,5 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { can.onimport.shareTitle(can, msg) + _init: function(can, msg) { var PLACE_NAME = msg.Option("_place_name"), PLACE_TYPE = msg.Option("_place_type") var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name"), APPLY_STATUS = "apply_status" can.onimport.itemcards(can, msg, function(value) { var status = value[APPLY_STATUS]; return [ diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 08fb7a0..f3c06b3 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -134,12 +134,16 @@ func (s Table) ValueModify(m *ice.Message, arg ...string) { s.RecordEventWithName(m, "") } func (s Table) ValueList(m *ice.Message, arg []string, fields ...ice.Any) *ice.Message { - kit.If(len(fields) == 0, func() { fields = kit.TransArgs(kit.Split(m.Config(mdb.FIELDS))) }) - defer m.Options(db.FIELDS, fields).Set(ice.MSG_OPTION, db.FIELDS) + if len(arg) > 0 { + kit.If(len(fields) == 0, func() { fields = kit.TransArgs(kit.Split(m.Config(mdb.FIELDS))) }) + defer m.Options(db.FIELDS, fields).Set(ice.MSG_OPTION, db.FIELDS) + } defer m.Options(db.TARGET, m.CommandKey()).Set(ice.MSG_OPTION, db.TARGET) s.ValueModel(m, s.ValueList, arg...).PushAction(s.Remove).Action(s.Create) - kit.If(m.Length() > 0, func() { s.UserPlaceInit(m) }) - s.Button(m, "") + if len(arg) > 0 { + kit.If(m.Length() > 0, func() { s.UserPlaceInit(m) }) + s.Button(m, "") + } return m } func (s Table) List(m *ice.Message, arg ...string) *ice.Message { @@ -231,11 +235,12 @@ func (s Table) ChangeStatus(m *ice.Message, uid string, from, to int, arg ...str } return m } -func (s Table) UserPlaceRole(m *ice.Message) int { - return kit.Int(m.Cmdx(s.Prefix(m, Portal{}), "userPlaceRole")) -} func (s Table) CheckRole(m *ice.Message, arg ...string) { - m.ErrorNotImplement() + role := UserPlaceRole(s.UserPlaceRole(m)) + m.WarnNotRight(!kit.IsIn(role.String(), append(arg, UserPlaceCreator.String())...), role.String()) +} +func (s Table) UserPlaceRole(m *ice.Message) int { + return kit.Int(m.Cmdx(s.Prefix(m, Portal{}), s.UserPlaceRole)) } func (s Table) UserPlaceInit(m *ice.Message, arg ...string) { if m.Option(model.PLACE_INIT) == "" { @@ -300,7 +305,10 @@ func (s Portal) SendTemplate(m *ice.Message, arg ...string) { m.Cmd(s.FindSpaceCmd(m, user{}), s.SendTemplate, arg[1], arg[2], link, kit.JoinWord(m.Option(model.PORTAL_NAME), arg[3]), name, kit.Cut(uid, 6)) } func (s Table) Button(m *ice.Message, info string, arg ...ice.Any) *ice.Message { - kit.If(!m.IsErr() && m.Length() == 0, func() { m.EchoInfoButton(info, arg...) }) + kit.If(!m.IsErr() && m.Length() == 0, func() { + m.Option(ctx.STYLE, html.FORM) + m.EchoInfoButton(info, arg...) + }) return m } func (s Table) DisplayBase(m *ice.Message, file string) *ice.Message { @@ -362,6 +370,7 @@ func (s Table) ProcessPodCmd(m, msg *ice.Message, arg ...string) *ice.Message { if msg.Append(web.SPACE) != "" { m.Optionv(ice.FIELD_PREFIX, ctx.ACTION, ctx.RUN, kit.Join(kit.Slice(kit.Split(msg.Append(ctx.INDEX), "."), 0, -1), ".")+".portal", ctx.ACTION, ctx.RUN, msg.Append(ctx.INDEX)) } + m.Push("field.option", kit.Format(kit.Dict(arg))) m.Option("field.option", kit.Format(kit.Dict(arg))) return m } diff --git a/src/gonganxitong/message.go b/src/gonganxitong/message.go index 04a19c0..f5d8d0e 100644 --- a/src/gonganxitong/message.go +++ b/src/gonganxitong/message.go @@ -34,7 +34,15 @@ func (s message) List(m *ice.Message, arg ...string) { ) if len(arg) < 2 { s.Orders(m, s.Desc(model.SCORE), s.Desc(model.CREATED_AT)) - s.Select(m, model.TO_USER_UID, m.Option(model.USER_UID)).Table(func(value ice.Maps) { + args := []string{model.TO_USER_UID, m.Option(model.USER_UID)} + kit.If(m.Option(model.MESSAGE_STATUS), func(p string) { + for i, v := range MessageStatusList { + if v == p { + args = append(args, model.STATUS, kit.Format(i)) + } + } + }) + s.Select(m, args...).Table(func(value ice.Maps) { button := []ice.Any{} if value[model.SCORE] == "0" { button = append(button, s.Sticky) diff --git a/src/gonganxitong/message.js b/src/gonganxitong/message.js index c96dfb7..5e196f2 100644 --- a/src/gonganxitong/message.js +++ b/src/gonganxitong/message.js @@ -1,17 +1,15 @@ +var MESSAGE_STATUS = "message_status" Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { - if (msg.IsDetail()) { var value = msg.TableDetail(); msg.Option("_share_title", value.place_name+" "+value.name) } - can.onimport.itemcards(can, msg, function(value) { var args = can.core.Split(value.args) - value.icons = value.user_avatar||value.icon; if (value.score > 0) { value._style = ["sticky"] } + _init: function(can, msg) { can.ui = can.page.Append(can, can._output, [html.TABS, html.LIST]) + can.onimport.myTabs(can, MESSAGE_STATUS, ["all", "create", "read", "done"], can.ui.tabs) + can.onimport.myView(can, msg, function(value) { var args = can.core.Split(value.args) + value.icons = value.user_avatar||value.icons; if (value.score > 0) { value._style = ["sticky"] } return [ - {view: html.TITLE, list: [value.place_name, value.name, (args[1]||"").slice(0, 6), value.message_status != "done" && can.onimport.textView(can, value, "message_status", mdb.STATUS)]}, + {view: html.TITLE, list: [value.place_name, value.name, (args[1]||"").slice(0, 6), value.message_status != "done" && can.onimport.textView(can, value, MESSAGE_STATUS, mdb.STATUS)]}, {view: html.STATUS, list: [value.city_name, value.street_name, value.service_name]}, {view: html.STATUS, list: [can.base.TimeTrim(value.created_at), value.user_name]}, value.info && {view: html.OUTPUT, list: [value.info]}, ] - }, function(event, value) { var args = can.core.Split(value.args)[1]||"" - can.onexport.title(can, [value.place_name, value.name, args.slice(0, 6)].join(" ")) - can.Option(UID, value.uid), can.Update(can.request(event, value)) - }) + }, null, can.ui.list) }, -}) \ No newline at end of file +}) diff --git a/src/gonganxitong/notice.go b/src/gonganxitong/notice.go index 577b26d..2129e01 100644 --- a/src/gonganxitong/notice.go +++ b/src/gonganxitong/notice.go @@ -2,6 +2,7 @@ package gonganxitong import ( "shylinux.com/x/ice" + kit "shylinux.com/x/toolkits" "shylinux.com/x/community/src/gonganxitong/model" ) @@ -9,17 +10,32 @@ import ( type notice struct { Table order string `data:"94"` - create string `name:"create title* content" role:"void"` + create string `name:"create title* content*" role:"landlord,teacher,leader"` + remove string `name:"remove" role:"landlord,teacher,leader"` } -func (s notice) Create(m *ice.Message, arg ...string) { s.ValueCreate(m, arg...) } -func (s notice) Remove(m *ice.Message, arg ...string) { s.ValueRemove(m, arg...) } +func (s notice) Init(m *ice.Message, arg ...string) { + s.Table.Init(m, arg...) + m.Design(s.List, "", kit.JoinWord(s.Keys(s.Place, model.UID), model.UID, ice.AUTO)) +} +func (s notice) Create(m *ice.Message, arg ...string) { + s.Table.Create(m, kit.Simple(arg, model.PLACE_UID, m.Option(s.Keys(s.Place, model.UID)), m.OptionSimple(model.USER_UID))...) + s.RecordEventWithName(m, "") +} +func (s notice) Remove(m *ice.Message, arg ...string) { + s.Table.Remove(m, kit.Simple(model.PLACE_UID, m.Option(s.Keys(s.Place, model.UID)), m.OptionSimple(model.UID))...) + s.RecordEventWithName(m, "") +} func (s notice) List(m *ice.Message, arg ...string) { + s.FieldsWithCreatedAT(m, s, model.TITLE, model.CONTENT, model.USER_UID) if len(arg) == 1 { s.Select(m, model.PLACE_UID, arg[0]) } else if len(arg) == 2 { - s.Select(m, model.PLACE_UID, arg[0], model.UID, arg[1]) + s.SelectDetail(m, model.PLACE_UID, arg[0], model.UID, arg[1]) + } else { + return } + s.SelectJoinUser(m) } func init() { ice.TeamCtxCmd(notice{Table: newTable()}) } diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index ece42e0..9c5187c 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -1,4 +1,33 @@ -$output { background-color:var(--plugin-bg-color); } +$action { background-color:transparent; position:fixed; top:0; width:100%; } +$action div.item.button { margin-right:5px; padding:0; } +$action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; display:unset; } +$action div.item.button input:hover { background-color:var(--hover-bg-color); } +$action div.item.button span { display:none; } +$output { background-color:var(--plugin-bg-color); position:unset; } +$output>div>div.list { box-shadow:var(--box-shadow); border-radius:10px; background-color:var(--output-bg-color); padding:10px; margin:10px; } +$output>div>div.list.mycount { min-height:105px; } +$output>div>div.list>div.title { font-weight:bold; display:flex; align-items:center; } +$output>div>div.list>div.title span:first-child { flex-grow:1; } +$output>div>div.list>div.title div.action div.item { margin-right:5px; } +$output>div>div.list>div.title div.action div.item.button.icons input { display:none; } +$output>div>div.list>div.role:not(.hide) { display:flex; align-items:center; justify-content:space-around; } +$output>div>div.list>div.role span { padding:5px; cursor:pointer; } +$output>div>div.list>div.role span:not(.select) { color:gray; } +$output>div>div.list>div.role span.select { border-bottom:var(--box-notice); } +$output>div>div.list>div.role span.creator.select { border-bottom:var(--box-danger); } +$output>div>div.list>div.role span.landlord.select { border-bottom:var(--box-danger); } +$output>div>div.list>div.role span.teacher.select { border-bottom:var(--box-danger); } +$output>div>div.list>div.role span.leader.select { border-bottom:var(--box-danger); } +$output>div>div.list>div.role span.boss.select { border-bottom:var(--box-danger); } +$output>div>div.list>div.output>div.item.index:not(.hide) { padding:5px 10px; display:flex; flex-direction:column; align-items:center; float:left; } +$output>div>div.list>div.output>div.item.index img { height:48px; width:48px; object-fit:contain; } +$output>div>div.list>div.output>div.item.index span { font-size:12px; white-space:pre; } +$output>div>div.list div.code { text-align:center; } +$output>div>div.list div.code input { background-color:var(--notice-bg-color); color:var(--notice-fg-color); font-size:18px; margin:auto; min-width:200px; display:block; margin-top:10px; } +$output>div>div.list fieldset.story>div.output { background-color:var(--output-bg-color); } +$output div.tabs { height:32px; display:flex; position:unset; } +$output div.tabs span { padding:5px 10px; } +$output div.tabs span.select { background-color:var(--output-bg-color); color:var(--hover-fg-color); } $output div.item.card { margin-bottom:2px; } $output div.item.card>div.output>div { width:100%; } $output div.item.card div.title { width:100%; display:flex; align-items:center; } @@ -7,53 +36,10 @@ $output div.item.card div.title span.time { position:absolute; right:0; font-siz $output div.item.card div.status span { word-break:break-all; } $output div.item.card img { border-radius:5px; padding:0; margin:0; margin-right:10px; height:48px; } $output div.item.card.sticky>div.output { background-color:var(--plugin-bg-color); color:var(--notice-bg-color); } -$output>div>div.list { box-shadow:var(--box-shadow); border-radius:10px; background-color:var(--output-bg-color); padding:10px; margin:10px; } -$output>div>div.list { min-height:105px; } -$output>div>div.list>div.title { font-weight:bold; display:flex; align-items:center; } -$output>div>div.list>div.title span:first-child { flex-grow:1; } -$output>div>div.list>div.title div.action div.item { margin-right:5px; } -$output>div>div.list>div.title div.action div.item.button.icons input { display:none; } -$output>div>div.list>div.role:not(.hide) { display:flex; align-items:center; justify-content:space-around; } -$output>div>div.list>div.role span { padding:5px; cursor:pointer; } -$output>div>div.list>div.role span.select { border-bottom:var(--box-notice); } -$output>div>div.list>div.role span.creator.select { border-bottom:var(--box-danger); } -$output>div>div.list>div.role span.landlord.select { border-bottom:var(--box-danger); } -$output>div>div.list>div.role span.teacher.select { border-bottom:var(--box-danger); } -$output>div>div.list>div.role span.leader.select { border-bottom:var(--box-danger); } -$output>div>div.list>div.role span.boss.select { border-bottom:var(--box-danger); } -$output>div>div.list>div.role span:not(.select) { color:gray; } -$output>div>div.list>div.output>div.item.index:not(.hide) { padding:5px 10px; display:flex; flex-direction:column; align-items:center; float:left; } -$output>div>div.list>div.output>div.item.index img { height:48px; width:48px; object-fit:contain; } -$output>div>div.list>div.action { display:flex; justify-content:center; display:none; } -$output>div>div.list>div.action div.item { margin-right:5px; } -$output>div>div.list>div.action div.item input[type=button] { color:var(--notice-bg-color); border:none; } -$output>div>div.list>div.action div.item i { display:none; } - -$action { background-color:transparent; } -$action>div.list { background-color:transparent; } -$action div.item.button { margin-right:5px; padding:0; } -$action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; float:left; display:unset; } -$action div.item.button input:hover { background-color:var(--hover-bg-color); } -$action div.item.button span { display:none; } -$action div.item.button i { display:none; } -$output { position:unset; } - -fieldset.Action>div.action { background-color:transparent; } -fieldset.Action>div.action>div.list { background-color:transparent; } -fieldset.Action>div.action div.item.button { margin-right:5px; padding:0; } -fieldset.Action>div.action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; float:left; } -fieldset.Action>div.action div.item.button input:hover { background-color:var(--hover-bg-color); } -fieldset.Action>div.action div.item.button span { display:none; } -fieldset.Action>div.action div.item.button i { display:none; } - -$output>div.action { background-color:transparent; } -$output>div.action>div.list { background-color:transparent; } -$output>div.action div.item.button { margin-right:5px; } -$output>div.action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; float:left; } -$output>div.action div.item.button input:hover { background-color:var(--hover-bg-color); } -$output>div.action div.item.button span { display:none; } -$output>div.action div.item.button i { display:none; } - +$output table.content td.action input.icons { display:unset; } +$output table.content td.action i { display:none; } +$output table.content.detail tr.action input.icons { display:unset; } +$output table.content.detail tr.action i { display:none; } $output input[type=button][name=submit] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); padding:0 20px; } $output input[type=button][name=cancel] { background-color:var(--danger-bg-color); color:var(--danger-fg-color); padding:0 20px; } $output input[type=button][name=reject] { background-color:var(--danger-bg-color); color:var(--danger-fg-color); padding:0 20px; } @@ -62,32 +48,30 @@ $output span.type { border:var(--box-notice); color:var(--notice-bg-color); padd $output span.role { border:var(--box-notice); color:var(--notice-bg-color); padding:0 3px; } $output span.type.danger { border:var(--box-danger); color:var(--danger-bg-color); } $output span.role.danger { border:var(--box-danger); color:var(--danger-bg-color); } -$output span.status.danger { border:var(--box-danger); color:var(--danger-bg-color); } -$output table.content.detail tr.action input.icons { display:unset; } -$output table.content.detail tr.action i { display:none; } -$output table.content td.action input.icons { display:unset; } -$output table.content td.action i { display:none; } -$output fieldset.form>div.output>div.code>input[type=button] { font-size:18px; margin:10px; height:36px; } -$output fieldset>div.output>div.code>input[type=button] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); margin-right:10px; min-width:80px; float:right; } -$output fieldset>div.output>div.code>input[type=button].danger { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } -$output fieldset>div.output>div.code>input[type=button][name=cancel] { border:var(--box-border); background-color:var(--danger-bg-color); color:var(--danger-fg-color); } -$output fieldset.story fieldset.story { position:absolute; top:0; height:100%; width:100%; } +$output>fieldset.story { margin-top:32px; } $output fieldset.story { box-shadow:none; } $output fieldset.story>legend { display:none; } $output fieldset.story>form.option { display:none; } $output fieldset.story>div.action { display:none; } $output fieldset.story>div.status { display:none; } $output fieldset.story>div.output { background-color:var(--plugin-bg-color); } -$output div.list fieldset.story>div.output { background-color:var(--output-bg-color); } $output fieldset.story>div.output table.content td { box-shadow:none; } -$output fieldset.story>div.output table.content tr.uid { display:none; } $output fieldset.story>div.output table.content td img { max-width:100%; } -$output>fieldset.story>div.output div.item.card>div.output { padding:10px; } -$output>fieldset.story>div.output div.item.card>div.output div.output { padding:5px 0; white-space:pre-line; } $output fieldset.story>div.output>div.code { text-align:center; } $output fieldset.story>div.output>div.code>img { display:block; margin:auto; width:100%; max-width:390px; } +$output fieldset.story>div.output>div.code>input[type=button] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); margin-right:10px; min-width:80px; float:right; } +$output fieldset.story>div.output>div.code>input[type=button].danger { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } +$output fieldset.story>div.output>div.code>input[type=button][name=cancel] { border:var(--box-border); background-color:var(--danger-bg-color); color:var(--danger-fg-color); } +$output>fieldset.story>div.output div.item.card>div.output { padding:10px; } +$output>fieldset.story>div.output div.item.card>div.output div.output { padding:5px 0; white-space:pre-line; } +$output fieldset.story.form>div.output>div.code>input[type=button] { font-size:18px; margin:10px; height:36px; } +$output>fieldset.message div.tabs span.select { border-top:var(--box-border); } +$output>fieldset.message div.tabs span.create.select { border-top:var(--box-danger); } +$output>fieldset.message div.tabs span.read.select { border-top:var(--box-notice); } $output>fieldset.qrcode table.content td { text-align:center; } -$output>fieldset.qrcode div.code { text-align:center; } +$output>fieldset.market>div.output>div.tabs { display:flex; width:100%; overflow:auto; height:30px; position:sticky; top:0; z-index:1; } +$output>fieldset.market>div.output>div.tabs>div.item { padding:5px 10px; float:left; white-space:pre; } +$output>fieldset.market>div.output>div.tabs>div.item.select { border-top:var(--box-danger); background-color:var(--output-bg-color); color:var(--danger-bg-color); font-weight:bold; position:sticky; left:0; right:0; } $output>fieldset.market>div.output>div.list div.item.card img { border-radius:50%; height:40px; width:40px; } $output>fieldset.market>div.output>div.list div.item.card div.status { font-size:14px; } $output>fieldset.market>div.output>div.list div.item.card div.status>span.username { color:var(--body-fg-color); font-size:14px; } @@ -96,14 +80,8 @@ $output>fieldset.market>div.output>div.list div.item.card div.output div.action $output>fieldset.market>div.output>div.list div.item.card div.output div.action i { margin-right:5px; } $output>fieldset.market>div.output>div.list div.item.card div.output div.output { padding:10px 0; } $output>fieldset.market>div.output>div.list div.item.card div.output div.action div.item.done { color:var(--notice-bg-color); } -// $output>fieldset.market>div.output>div.list div.item.card div.status>span.street { color:var(--notice-bg-color); } -// $output>fieldset.market>div.output>div.list div.item.card div.status>span.place { color:var(--notice-bg-color); } -$output>fieldset.market>div.output>div.tabs { display:flex; width:100%; overflow:auto; height:30px; position:sticky; top:0; z-index:1; } -$output>fieldset.market>div.output>div.tabs::-webkit-scrollbar { width:0 !important; height:0 !important; } -$output>fieldset.market>div.output>div.tabs>div.item { padding:5px 10px; float:left; white-space:pre; } -$output>fieldset.market>div.output>div.tabs>div.item.select { border-top:var(--box-danger); background-color:var(--output-bg-color); color:var(--danger-bg-color); font-weight:bold; position:sticky; left:0; right:0; } body.light.mobile { --plugin-bg-color:#f4f5f9; --output-bg-color:#fefefd; } -body.mobile $output>div>div.list div.item.index span { font-size:12px; white-space:pre; } body.mobile fieldset.panel.Action>div.output { background-color:var(--plugin-bg-color); } body:not(.mobile) $output>fieldset.story>div.output div.item.card:not(:hover) { background-color:var(--output-bg-color); } body.en $output>fieldset table.content td:first-child { max-width:180px; width:unset;} +$fieldset { box-shadow:none; } diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index a58d8e0..4f9093b 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -20,12 +20,12 @@ type Portal struct { event event message message recent recent - command command service service export string `data:"true"` short string `data:"index"` field string `data:"time,icons,name,index,order,enable,init,type,role,view,command_uid"` create string `name:"create index name icons"` + command string `name:"command" role:"void"` list string `name:"list place_uid index uid auto" role:"void"` placeCreate string `name:"placeCreate city_name* street_name* place_type*:select place_name* address*" icon:"bi bi-plus-square-dotted" role:"void"` placeRemove string `name:"placeRemove uid*" role:"void"` @@ -84,7 +84,7 @@ func (s Portal) Run(m *ice.Message, arg ...string) { if kit.IsIn(role, "", aaa.VOID, aaa.TECH, aaa.ROOT) { kit.If(!ctx.PodCmd(m.Message, arg) && aaa.Right(m.Message, arg), func() { m.Cmdy(arg) }) } else { - if !m.Cmdy(arg[0], s.CheckRole, role).IsErr() { + if !m.Cmdy(arg[0], s.CheckRole, kit.Split(role)).IsErr() { m.Cmdy(arg) } } @@ -93,6 +93,9 @@ func (s Portal) Run(m *ice.Message, arg ...string) { } }) } +func (s Portal) Command(m *ice.Message, arg ...string) { + m.Cmdy(ctx.COMMAND, arg[0]).Push(model.COMMAND_UID, s.Hash.List(m.Spawn(), arg[0]).Append(model.COMMAND_UID)) +} func (s Portal) List(m *ice.Message, arg ...string) { if m.Option(mdb.VIEW) == mdb.TABLE { s.Hash.List(m, arg...).PushAction(mdb.DETAIL, s.Hash.Remove).SortInt(mdb.ORDER) @@ -112,21 +115,12 @@ func (s Portal) List(m *ice.Message, arg ...string) { m.PushButton(s.PlaceRemove) } }).Action(s.PlaceCreate, s.PlaceSearch) - kit.If(!m.IsErr() && m.Length() == 0, func() { m.EchoInfoButton("", s.PlaceCreate, s.ScanQRCode, s.PlaceSearch) }) - } else if len(arg) == 1 { - if arg[0] != "" { - msg := s.PlaceListOption(m, arg...) - m.Option(model.PLACE_NAME, msg.Append(s.Keys(s.Place, model.NAME))) - m.Option(model.STREET_NAME, msg.Append(s.Keys(s.Street, model.NAME))) - s.AddRecent(msg, arg[0]) + s.Button(m, "", s.PlaceCreate) + } else { + if msg := s.PlaceListOption(m, arg...); arg[0] != "" { + defer s.AddRecent(msg, arg[0]) } s.Hash.List(m).SortInt(mdb.ORDER) - } else if len(arg) == 2 { - s.PlaceListOption(m, arg...) - m.Option(model.COMMAND_UID, s.Hash.List(m.Spawn(), arg[1]).Append(model.COMMAND_UID)) - m.Cmdy(ctx.COMMAND, arg[1]).Push(ctx.ARGS, arg[0]) - } else { - m.FieldsSetDetail().Cmdy(arg[1], mdb.SELECT, model.UID, arg[2]).Action() } s.Place.RewriteAppend(m) s.DisplayBase(m, "").DisplayCSS("") @@ -142,7 +136,13 @@ func (s Portal) PlaceListOption(m *ice.Message, arg ...string) *ice.Message { s.SelectJoinAuth(msg) } s.Place.RewriteAppend(msg) - m.Options(msg.AppendSimple(model.AUTH_STATUS, model.DASHBOARD_UID, s.Keys(s.Place, model.NAME), s.Keys(s.Place, model.TYPE), s.Keys(s.UserPlace, model.ROLE), s.Keys(s.Street, model.NAME), model.CITY_NAME)) + m.Options(msg.AppendSimple( + s.Keys(s.Place, model.NAME), s.Keys(s.Place, model.TYPE), + s.Keys(s.UserPlace, model.ROLE), s.Keys(s.Street, model.NAME), model.CITY_NAME, + model.AUTH_STATUS, model.DASHBOARD_UID, + )) + m.Option(model.PLACE_NAME, msg.Append(s.Keys(s.Place, model.NAME))) + m.Option(model.STREET_NAME, msg.Append(s.Keys(s.Street, model.NAME))) return msg } func (s Portal) PlaceCreate(m *ice.Message, arg ...string) { @@ -170,10 +170,9 @@ func (s Portal) PlaceRemove(m *ice.Message, arg ...string) { m.Cmdy(s.UserPlace, s.Delete, m.OptionSimple(model.USER_UID, model.UID)) } func (s Portal) PlaceList(m *ice.Message, arg ...string) *ice.Message { - s.Tables(m, s.Place).FieldsWithCreatedAT(m, s.UserPlace, model.AUTH_UID, s.Key(s.Place, model.INIT), - s.Keys(s.Place, model.NAME), s.Keys(s.Place, model.TYPE), s.Keys(s.UserPlace, model.ROLE), - s.Keys(s.Place, model.UID), s.Keys(s.Street, model.UID), - ) + s.Tables(m, s.Place).FieldsWithCreatedAT(m, s.UserPlace, s.Key(s.Place, model.INIT), model.AUTH_UID, + s.Keys(s.Place, model.UID), s.Keys(s.Place, model.NAME), s.Keys(s.Place, model.TYPE), s.Keys(s.UserPlace, model.ROLE), + s.Keys(s.Street, model.UID)) if len(arg) == 1 { m.Cmdy(s.UserPlace, s.Table.Select, model.USER_UID, arg[0]) } else if len(arg) == 2 { @@ -243,7 +242,23 @@ func (s Portal) ValueModify(m *ice.Message, arg ...string) { s.Table.Update(m, kit.Dict(arg), m.OptionSimple(s.Keys(s.Place, model.UID), model.UID)...) } func (s Portal) ValueList(m *ice.Message, arg ...string) { - s.TablesWithRole(m, arg, s.UserPlace, s.Place, m.Option("target"), m.Optionv(mdb.FIELDS).([]ice.Any)...) + // s.TablesWithRole(m, arg, s.UserPlace, s.Place, m.Option("target"), m.Optionv(mdb.FIELDS).([]ice.Any)...) + PLACE_UID := s.Keys(s.Place, model.UID) + if len(arg) == 0 { + if m.Option(PLACE_UID) != "" { + s.Table.Select(m, m.OptionSimple(PLACE_UID)...) + } + return + } + s.Table.FieldsWithCreatedAT(m, m.Option("target"), m.Optionv(mdb.FIELDS).([]ice.Any)...) + if len(arg) == 1 { + s.Table.Select(m, PLACE_UID, arg[0]) + } else if len(arg) == 2 { + s.Table.SelectDetail(m, PLACE_UID, arg[0], model.UID, arg[1]) + } else { + return + } + m.PushAction(s.Remove) } func (s Portal) BeforePlaceCreate(m *ice.Message, arg ...string) {} func (s Portal) AfterPlaceCreate(m *ice.Message, arg ...string) {} @@ -284,7 +299,7 @@ func (s Portal) PlaceCmd(m *ice.Message, arg ...string) { func (s Portal) UpdateCommand(m *ice.Message, arg ...string) { m.Config(model.SERVICE_UID, arg[0]) s.Hash.Select(m.Spawn()).Table(func(value ice.Maps) { - uid := m.Cmdx(s.command, s.Table.Update, model.SERVICE_UID, arg[0], mdb.ICON, value[mdb.ICONS], model.NAME, value[model.NAME], model.INDEX, value[model.INDEX]) + uid := m.Cmdx(command{}, s.Table.Update, model.SERVICE_UID, arg[0], mdb.ICON, value[mdb.ICONS], model.NAME, value[model.NAME], model.INDEX, value[model.INDEX]) s.Hash.Modify(m, ctx.INDEX, value[ctx.INDEX], model.COMMAND_UID, uid) }) } diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 2798aa3..4b7dbb2 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -1,21 +1,13 @@ 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) { - if (can.user.isMobile && can.isCmdMode()) { can.onappend.style(can, html.OUTPUT), can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) } - can.onimport.myPortal(can, msg) - }, - typeStyle: function(can, value, key) { return can.Conf("_trans.value."+key+".style."+value[key])||"" }, - roleStyle: function(can, value, key) { return can.Conf("_trans.value."+key+".style."+value[key])||"" }, - timeView: function(can, value) { return {text: [can.base.TimeTrim(value.updated_at||value.created_at), "", mdb.TIME]} }, - authView: function(can, value) { return can.base.isIn(value.auth_status, "issued", "2") && {view: [aaa.AUTH, html.SPAN], list: [{icon: "bi bi-patch-check-fill", style: {color: "var(--notice-bg-color)"}}]} }, + _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]]}, + {text: [value.__type, "", [mdb.TYPE, value._type, value._type_style]]}, value._role != "visitor" && {text: [value.__role, "", [aaa.ROLE, value._role, value._role_style]]}, ]}, {view: html.STATUS, list: [value.uid.slice(0, 6), value.city_name, value._street]}, ] }, - myTrans: function(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, STREET_NAME, USER_PLACE_ROLE) { + myTrans: function(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME) { value.icons = value.icons||can.Conf(can.core.Keys("_trans.value", PLACE_TYPE, mdb.ICONS, value[PLACE_TYPE])) value._uid = value[PLACE_UID], value._name = value[PLACE_NAME], value._street = value[STREET_NAME] value._type = value[PLACE_TYPE], value.__type = can.user.transValue(can, value, PLACE_TYPE) @@ -24,71 +16,58 @@ Volcanos(chat.ONIMPORT, { value._type_style = can.onimport.typeStyle(can, value, PLACE_TYPE) }, myPortal: function(can, msg) { - var PLACE_UID = msg.Option("_place_uid"), PLACE_NAME = msg.Option("_place_name"), PLACE_TYPE = msg.Option("_place_type") - var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name") - if (can.Option(PLACE_UID) == "" && can.Option(ctx.INDEX) == "") { - can.isCmdMode() && (can.db.hash = can.base.Obj(can.misc.SearchHash(can), can.db.hash)), can.db.hash[0] && can.onexport.session(can, PLACE_UID, can.db.hash[0]) - if (can.db.hash.length > 1 && can.db.hash[0]) { - return can.run({}, can.db.hash, function(msg) { - msg.Table(function(value) { can.onimport.myStory(can, msg, value, PLACE_UID, PLACE_NAME, STREET_NAME) }) - }) - } - can.ui = can.page.Append(can, can._output, [ - {view: html.OUTPUT, list: ["myplace.list", "mycount.list", "myinit.list", "myindex.list", "myallow.list"]}, - {view: html.ACTION, list: ["myorder.list"]}, - ]) - var uid = can.onimport.myPlace(can, msg, can.ui.myplace, PLACE_UID, PLACE_NAME, PLACE_TYPE) - msg.Length() > 0? can.run({}, [uid], function(msg) { can._index_msg = msg - can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID, USER_PLACE_ROLE), can.onimport.selectIndex(can, can.sup.current) - can.onimport.myAllow(can, msg, can.ui.myallow, PLACE_UID, USER_PLACE_ROLE) - can.onimport.myOrder(can, msg, can.ui.myorder, PLACE_UID, USER_PLACE_ROLE) - }): can.run({}, [uid], function(msg) { can._index_msg = msg - can.onimport.myOrder(can, msg, can.ui.myorder, PLACE_UID, USER_PLACE_ROLE) - }), can.ui.place_count = msg.Length() - } else if (can.Option(ctx.INDEX) == "") { - can.ui = can.page.Append(can, can._output, [ - {view: html.OUTPUT, list: ["myplace.list", "myindex.list", "myallow.list"]}, - {view: html.ACTION, list: ["myorder.list"]}, - ]) - var _msg = can.request({}, {_user_place_role: msg.Option("_user_place_role"), _street_name: msg.Option("_street_name")}); _msg.Push(kit.Dict(UID, "", - PLACE_UID, can.Option(PLACE_UID), PLACE_NAME, msg.Option(PLACE_NAME), PLACE_TYPE, msg.Option(PLACE_TYPE), USER_PLACE_ROLE, msg.Option(USER_PLACE_ROLE), - CITY_NAME, msg.Option(CITY_NAME), STREET_NAME, msg.Option(STREET_NAME), "auth_status", msg.Option("auth_status"), - )) - _msg.Option(ice.MSG_ACTION, msg.Option(USER_PLACE_ROLE) == "visitor"? '[]': '["placeCreate","placeSearch"]') - can.onimport.myPlace(can, _msg, can.ui.myplace, PLACE_UID, PLACE_NAME, PLACE_TYPE) - can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID, USER_PLACE_ROLE), can.onimport.selectIndex(can, can.sup.current) - can.onimport.myAllow(can, msg, can.ui.myallow, PLACE_UID, USER_PLACE_ROLE) - can.onimport.myOrder(can, msg, can.ui.myorder, PLACE_UID, USER_PLACE_ROLE) + can.core.List(["_place_uid", "_place_name", "_place_type", "_user_place_role", "_street_name"], function(key) { can.Conf(key, msg.Option(key)) }) + can.isCmdMode() && (can.db.hash = can.base.Obj(can.misc.SearchHash(can), can.db.hash)), can.db.hash[0] && can.onexport.place(can, can.db.hash[0]) + if (can.db.hash.length > 1 && can.db.hash[1]) { + return can.run({}, [ctx.COMMAND, can.db.hash[1]], function(msg) { msg.Table(function(value) { + value.args = [can.db.hash[0]].concat(can.db.hash.slice(2)), can.onimport.myStory(can, value) + }) }) + } + can.ui = can.page.Append(can, can._output, [ + {view: html.OUTPUT, list: ["mydebug.list", "myplace.list", "mycount.list", "myinit.list", "myindex.list", "myallow.list"]}, + {view: html.ACTION, list: ["myorder.list"]}, + ]) + function showIndex(msg) { + can.onimport.myDebug(can, msg, can.ui.mydebug) + can.onimport.myIndex(can, msg, can.ui.myindex, USER_PLACE_ROLE), can.onexport.index(can, can.sup.current) + can.onimport.myAllow(can, msg, can.ui.myallow), can.onimport.myOrder(can, msg, can.ui.myorder) + } + var PLACE_UID = can.Conf("_place_uid"), PLACE_NAME = can.Conf("_place_name"), PLACE_TYPE = can.Conf("_place_type") + var USER_PLACE_ROLE = can.Conf("_user_place_role"), STREET_NAME = can.Conf("_street_name") + if (can.Option(PLACE_UID) == "") { var uid = can.onimport.myPlace(can, msg, can.ui.myplace) + msg.Length() > 0? can.run({}, [uid], function(msg) { showIndex(can._index_msg = msg) }): can.run({}, [uid], function(msg) { can.onimport.myOrder(can, can._index_msg = msg, can.ui.myorder) }) } else { - msg.Table(function(value) { can.onimport.myStory(can, msg, value, PLACE_UID, PLACE_NAME, STREET_NAME) }) + var _msg = can.request({}); _msg.Push(kit.Dict(UID, "", msg.OptionSimple(PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME, "auth_status", "dashboard_uid"))) + _msg.Option(ice.MSG_ACTION, msg.Option(USER_PLACE_ROLE) == "visitor"? '[]': '["placeCreate","placeSearch"]') + can.onimport.myPlace(can, _msg, can.ui.myplace), showIndex(can._index_msg = msg) } }, - myPlace: function(can, msg, target, PLACE_UID, PLACE_NAME, PLACE_TYPE) { var place_uid - var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name") + myPlace: function(can, msg, target) { var place_uid + var PLACE_UID = can.Conf("_place_uid"), PLACE_NAME = can.Conf("_place_name"), PLACE_TYPE = can.Conf("_place_type") + var USER_PLACE_ROLE = can.Conf("_user_place_role"), STREET_NAME = can.Conf("_street_name") can.page.Append(can, target, [{view: html.TITLE, list: [ {text: can.user.trans(can, "My "+can.base.capital(PLACE_NAME.replace("_name", "")), null, html.INPUT)}, msg.Option(ice.MSG_ACTION) && {view: html.ACTION, _init: function(target) { can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }} ]}]), can.ui._target = can.page.Append(can, target||can._output, [html.OUTPUT])._target msg.Length() > 0 && can.page.Append(can, can.ui._target, msg.Table(function(value) { - can.onimport.myTrans(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, STREET_NAME, USER_PLACE_ROLE) - place_uid = place_uid||value._uid, value._uid == can.onexport.session(can, PLACE_UID) && (place_uid = value._uid), place_uid == value._uid && (can.sup.current = value) - return can.onimport.itemcard(can, value, can.onimport.myValue(can, value, PLACE_UID, PLACE_NAME, STREET_NAME), function(event) { - can.onexport.value(can, value, PLACE_UID, PLACE_NAME) - }) - })), msg.Option(ice.MSG_ACTION) && can.page.Append(can, target, [{view: html.ACTION, _init: function(target) { can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }}]) + can.onimport.myTrans(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME) + place_uid = place_uid||value._uid, value._uid == can.onexport.place(can) && (place_uid = value._uid), place_uid == value._uid && (can.sup.current = value) + return can.onimport.itemcard(can, value, can.onimport.myValue(can, value), function(event) { can.onexport.value(can, value) }) + })), msg.Result() && can.onappend.board(can, msg.Result(), can.ui._target) return place_uid||"" }, - myCount: function(can, msg, value, target) { if (!msg) { return } can.onmotion.toggle(can, target, !!value._count) - if (can.onmotion.cache(can, function() { return value._uid }, target)) { return } if (!value.dashboard_uid) { return } - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Count", "我的数据")}]}]) + myTitle: function(can, name, help, target) { + can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, name, help)}]}]) + }, + myCount: function(can, value, target) { can.onmotion.toggle(can, target, !!value._count) + if (can.onmotion.cache(can, function() { return value._uid }, target) || !value.dashboard_uid) { return } can.onimport.myTitle(can, "My Count", "我的数据", target) can.onappend.plugin(can._root.Action, {width: can.ConfWidth()-40, space: "20240903-operation", index: "web.team.dashboard.summary", args: [value.dashboard_uid]}, function(sub) { can.onmotion.toggle(can, target, value._count = true) }, target) }, myInit: function(can, msg, value, target) { if (!msg) { return } can.onmotion.toggle(can, target, !!value._init) - if (can.onmotion.cache(can, function() { return value._uid }, target)) { return } - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Init", "我的初始化")}]}]) - msg.Table(function(val) { if (parseInt(val.init) == parseInt(value.init)+1) { value._init = true, val.args = [value._uid], val.style = html.OUTPUT + if (can.onmotion.cache(can, function() { return value._uid }, target)) { return } can.onimport.myTitle(can, "My Init", "我的初始化", target) + msg.Table(function(val) { if (parseInt(val.init) == parseInt(value.init)+1) { value._init = true, val.args = [value._uid] can.onappend.plugin(can, val, function(sub) { var run = sub.run; sub.run = function(event, cmds, cb) { run(can.request(event, {place_uid: value._uid, place_init: value.init}), cmds, function(msg) { if (cmds[1] == mdb.CREATE || cmds.length == 1 && msg.Length() > 0) { can.onmotion.clearInput(can), can.Update() } else { cb(msg) } @@ -96,43 +75,65 @@ Volcanos(chat.ONIMPORT, { }, can.onmotion.toggle(can, target, !!value._init) }, target) } }) }, - myList: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { - var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/100); can.user.isMobile && !can.user.isLandscape() && (width = (can.ConfWidth()-40)/5) + myList: function(can, msg, target) { + var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/80); can.user.isMobile && !can.user.isLandscape() && (width = (can.ConfWidth()-40)/5) can.page.Append(can, target, msg.Table(function(value) { if (value.enable == ice.FALSE) { return } return {view: [[html.ITEM, ctx.INDEX].concat( value.type? [mdb.TYPE]: [], can.core.Split(value.type||""), value.role? [aaa.ROLE]: [], can.core.Split(value.role||""), )], style: {width: width}, list: [ {img: can.misc.ResourceIcons(can, value.icons)}, {text: can.user.trans(can, value.index.split(".").pop(), value.name)}, ], onclick: function(event) { - can.onimport.myStory(can, msg, {space: can.ConfSpace(), index: value.index, args: [can.onexport.session(can, PLACE_UID)]}, PLACE_UID, PLACE_NAME, STREET_NAME) + can.onimport.myStory(can, {space: can.ConfSpace(), index: value.index, args: [can.onexport.place(can)]}) }} })) }, - myIndex: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Index", "我的应用")}]}]) + mySplit: function(can, msg, target, min, max) { + var _msg = can.request(); msg.Table(function(value) { if (min < value.order && value.order < max) { _msg.Push(value) } }) + var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output) + }, + myIndex: function(can, msg, target, USER_PLACE_ROLE) { can.onimport.myTitle(can, "My Index", "我的应用", target) var role = can.page.Append(can, target, [{view: aaa.ROLE, list: can.core.Item(can.Conf("_trans.value."+USER_PLACE_ROLE), function(key, value) { if (can.base.isIn(key, ctx.STYLE, mdb.ICONS)) { return } return {text: [can.user.trans(can, key, value), "", key], onclick: function(event) { - can.onexport.value(can, can.sup.current, PLACE_UID), can.onimport.selectIndex(can, can.sup.current, key) - can.onmotion.select(can, role, html.SPAN, event.target) + can.onexport.value(can, can.sup.current), can.onexport.index(can, can.sup.current, key), can.onmotion.select(can, role, html.SPAN, event.target) }} }) }])._target; can.ui.role = role - var _msg = can.request(); msg.Table(function(value) { if (value.order < 90) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + can.onimport.mySplit(can, msg, target, 0, 90) }, - myAllow: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Allow", "我的权限")}]}]) - var _msg = can.request(); msg.Table(function(value) { if (value.order > 89 && value.order < 100) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + myAllow: function(can, msg, target) { can.onimport.myTitle(can, "My Allow", "我的权限", target) + can.onimport.mySplit(can, msg, target, 89, 100) }, - myOrder: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Order", "我的系统")}]}]) - var _msg = can.request(); msg.Table(function(value) { if (value.order > 99) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) - if (can.user.isMobile && can.isCmdMode()) { can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) } - can.onimport.layout(can), can.onexport.value(can, can.sup.current, PLACE_UID) + myOrder: function(can, msg, target) { + can.onimport.myTitle(can, "My Order", "我的系统", target) + can.onimport.mySplit(can, msg, target, 99, 1000), can.onimport.layout(can), can.onexport.value(can, can.sup.current) + can.onmotion.delay(can, function() { can.onimport.layout(can) }, 30) + can.onmotion.delay(can, function() { can.onimport.layout(can) }, 300) }, - selectIndex: function(can, value, role) { role = role||value._role + 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"}, + {text: ""+can.ConfHeight()+"\n"}, + ]) + }, + layout: function(can) { + if (can.ui.action && can.ui.output) { + can.page.style(can, can.ui.output, html.HEIGHT, can.ConfHeight() - can.ui.action.offsetHeight) + can.user.isMobile && can.page.style(can, can.ui.output, html.HEIGHT, window.innerHeight - can.ui.action.offsetHeight) + } + }, +}) +Volcanos(chat.ONEXPORT, { + place: function(can, value) { return can.onexport.session(can, PLACE_UID, value) }, + value: function(can, value) { if (!value) { return } can.sup.current = value, can.onexport.index(can, can.sup.current) + can.onexport.place(can, value._uid), can.onexport.hash(can, value._uid), can.onexport.title(can, value._name, can.ConfHelp()), can.user.agent.init(can) + can.page.Select(can, can.ui._target, "div.item.card.uid-"+value._uid, function(item) { can.onmotion.select(can, can.ui._target, html.DIV_ITEM, item) }) + can.onimport.myCount(can, value, can.ui.mycount), can.onimport.myInit(can, can._index_msg, value, can.ui.myinit) + can.onmotion.toggle(can, can.ui.myallow, can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0) + }, + index: function(can, value, role) { role = role||value._role can.ui.role && can.onmotion.toggle(can, can.ui.role, value._role == "creator") can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) can.page.Select(can, can.ui.myindex, html.DIV_ITEM, function(target) { var list = target.className.split(" ") @@ -145,21 +146,4 @@ Volcanos(chat.ONIMPORT, { } }) }, - layout: function(can) { - can.ui.action && can.ui.output && can.onmotion.delay(can, function() { - can.page.style(can, can.ui.output, html.HEIGHT, can.ConfHeight() - can.ui.action.offsetHeight) - }) - }, -}) -Volcanos(chat.ONEXPORT, { - value: function(can, value, PLACE_UID) { if (!value) { return } can.sup.current = value, can.onimport.selectIndex(can, can.sup.current) - can.sup.Conf("place_name", value._name), can.onexport.title(can, can.sup.Conf("place_name"), can.ConfHelp()) - can.onexport.session(can, PLACE_UID, value._uid), can.onexport.hash(can, value._uid), can.user.agent.init(can) - can.page.Select(can, can.ui._target, "div.item.card.uid-"+value._uid, function(item) { can.onmotion.select(can, can.ui._target, html.DIV_ITEM, item) }) - can.onimport.myCount(can, can._index_msg, value, can.ui.mycount), can.onimport.myInit(can, can._index_msg, value, can.ui.myinit) - can.onmotion.toggle(can, can.ui.myallow, can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0) - }, - share_title: function(can, msg, title, role) { - msg.Option("_share_icons", msg.Append("user_avatar")), msg.Option("_share_content", can.user.transValue(can, msg, role)+" "+msg.Append("user_name")) - }, }) diff --git a/src/gonganxitong/recent.js b/src/gonganxitong/recent.js index d3920d4..cab3282 100644 --- a/src/gonganxitong/recent.js +++ b/src/gonganxitong/recent.js @@ -1,19 +1,14 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { can.onimport.shareTitle(can, msg) - can.onimport.itemcards(can, msg, function(value) { var args = can.core.Split(value.args) + _init: function(can, msg) { + can.onimport.myView(can, msg, function(value) { var args = can.core.Split(value.args) value.icons = can.misc.Resource(can, value.service_icon, value.space); if (value.score > 0) { value._style = ["sticky"] } - var sub = can._root.Action._plugins[[value.space, value.index, args[0]].join(",")] return [ - {view: html.TITLE, list: [value.place_name, can.onimport.authView(can, value), sub? {text: ["load", "", mdb.STATUS]}: "", can.onimport.timeView(can, value)]}, + {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) { + }, function(event, value) { can.onaction._goback(can) var args = can.core.Split(value.args) - // debugger - // can.onaction._goback(can) - can.onimport.myPlugin(can, {_title: value.place_name, space: value.space, index: value.index, args: [args[0]]}, function(sub) { - can.onaction._goback(can) - }) + can.onimport.myPlugin(can, {space: value.space, index: value.index, args: [args[0]]}) }) }, }) diff --git a/src/gonganxitong/service.js b/src/gonganxitong/service.js index 22a08aa..c059166 100644 --- a/src/gonganxitong/service.js +++ b/src/gonganxitong/service.js @@ -1,15 +1,11 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - can.onimport.itemcards(can, msg, function(value) { return [ + can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.name, can.onimport.textView(can, value, "service_type"), can.onimport.textView(can, value, "service_status")]}, - // {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.updated_at)]}, {view: html.STATUS, list: [value.index]}, {view: html.STATUS, list: [value.module, value.version]}, - // {view: html.STATUS, list: [value.domain.split("?")[0]]}, - ] }, function(event, value) { - // can.onaction._goback(can) + ] }, function(event, value) { can.onaction._goback(can) can.onimport.myPlugin(can, {space: value.space||value.nodename, index: value.index}) - can.onmotion.delay(can, function() { can.onaction._goback(can) }, 300) }) }, }) diff --git a/src/yuehaoxitong/model/model.go b/src/yuehaoxitong/model/model.go index 18288d0..32208e6 100644 --- a/src/yuehaoxitong/model/model.go +++ b/src/yuehaoxitong/model/model.go @@ -50,6 +50,7 @@ type Queue struct { type Reception struct { db.ModelWithUID QueueUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` Name string `gorm:"type:varchar(64)"` } type Volume struct { diff --git a/src/yuehaoxitong/open.go b/src/yuehaoxitong/open.go index f9eea8f..0958091 100644 --- a/src/yuehaoxitong/open.go +++ b/src/yuehaoxitong/open.go @@ -19,9 +19,8 @@ func (s open) Create(m *ice.Message, arg ...string) { s.RecordEvent(m, m.Trans("create volume", "创建服务计划")+"\n"+s.joinKV(m, model.AMOUNT, model.BEGIN_TIME, model.END_TIME), m.Result()) } func (s open) List(m *ice.Message, arg ...string) { - m.Cmdy(s.volume, arg) - kit.If(m.Length() == 0, func() { m.EchoInfoButton("") }) - m.PushAction(s.Market) + m.Cmdy(s.volume, arg).PushAction(s.Market) + s.Button(m, "") } func init() { ice.TeamCtxCmd(open{}) } diff --git a/src/yuehaoxitong/plan.go b/src/yuehaoxitong/plan.go index f8eb072..b2e37ad 100644 --- a/src/yuehaoxitong/plan.go +++ b/src/yuehaoxitong/plan.go @@ -18,8 +18,8 @@ func (s plan) Create(m *ice.Message, arg ...string) { } func (s plan) List(m *ice.Message, arg ...string) { if len(arg) == 1 { - s.SelectByStatus(m, kit.Simple(arg[0], SchedulePlan, m.OptionSimple(model.USER_UID))...).PushAction(s.Cancel) - kit.If(m.Length() == 0, func() { m.EchoInfoButton("") }, func() { m.Action(s.Create) }) + s.SelectByStatus(m, kit.Simple(arg[0], SchedulePlan, m.OptionSimple(model.USER_UID))...).PushAction(s.Cancel).Action(s.Create) + s.Button(m, "") } else if len(arg) == 2 { s.Schedule.List(m, arg...) } diff --git a/src/yuehaoxitong/reception.go b/src/yuehaoxitong/reception.go index c192c01..df5f60d 100644 --- a/src/yuehaoxitong/reception.go +++ b/src/yuehaoxitong/reception.go @@ -1,48 +1,22 @@ package yuehaoxitong -import ( - "shylinux.com/x/ice" - kit "shylinux.com/x/toolkits" - - "shylinux.com/x/community/src/yuehaoxitong/model" -) +import "shylinux.com/x/ice" type reception struct { Table + fields string `data:"name"` create string `name:"create name*" role:"leader"` rename string `name:"rename name*" role:"leader"` remove string `name:"remove" role:"leader"` } -func (s reception) Create(m *ice.Message, arg ...string) { - s.Table.Create(m, append(arg, m.OptionSimple(model.QUEUE_UID)...)...) - s.RecordEventWithName(m, "") -} -func (s reception) Rename(m *ice.Message, arg ...string) { - s.Table.Rename(m, m.OptionSimple(model.QUEUE_UID, model.UID)...) - s.RecordEventWithName(m, "") -} -func (s reception) Remove(m *ice.Message, arg ...string) { - s.Table.Delete(m, m.OptionSimple(model.QUEUE_UID, model.UID)...) - s.RecordEventWithName(m, "") -} +func (s reception) Create(m *ice.Message, arg ...string) { s.ValueCreate(m, arg...) } +func (s reception) Rename(m *ice.Message, arg ...string) { s.ValueModify(m, arg...) } +func (s reception) Remove(m *ice.Message, arg ...string) { s.ValueRemove(m, arg...) } func (s reception) List(m *ice.Message, arg ...string) { - if len(arg) == 0 { - if m.Option(model.QUEUE_UID) != "" { - s.Table.Select(m, m.OptionSimple(model.QUEUE_UID)...) - } - return + if s.ValueList(m, arg); len(arg) > 0 { + m.PushAction(s.Rename, s.Remove) } - s.Table.FieldsWithCreatedAT(m, s, model.NAME) - if len(arg) == 1 { - s.Table.Select(m, model.QUEUE_UID, arg[0]) - kit.If(!m.IsErr() && m.Length() == 0, func() { m.EchoInfoButton("") }) - } else if len(arg) == 2 { - s.Table.SelectDetail(m, model.QUEUE_UID, arg[0], model.UID, arg[1]) - } else { - return - } - m.PushAction(s.Rename, s.Remove) } func init() { ice.TeamCtxCmd(reception{}) }