From bf9fb9afcdcc0a3a861e996e38d77817de360bd4 Mon Sep 17 00:00:00 2001 From: jingganjiaoyu Date: Mon, 5 Aug 2024 02:09:58 +0800 Subject: [PATCH] opt some --- src/gonganxitong/apply.go | 108 ++++++++---------- src/gonganxitong/apply.js | 26 +++-- src/gonganxitong/city.go | 4 - src/gonganxitong/common.go | 73 ++++++++++-- src/gonganxitong/email.go | 25 ++-- src/gonganxitong/event.go | 11 +- src/gonganxitong/event.js | 15 +-- src/gonganxitong/express/express.go | 12 +- src/gonganxitong/icons/apply.png | Bin 4840 -> 0 bytes src/gonganxitong/icons/event.png | Bin 4684 -> 0 bytes src/gonganxitong/icons/house.png | Bin 6121 -> 0 bytes src/gonganxitong/icons/office.png | Bin 4370 -> 0 bytes src/gonganxitong/icons/order.png | Bin 4212 -> 0 bytes src/gonganxitong/model/model.go | 34 +++--- src/gonganxitong/order.go | 48 +++++--- src/gonganxitong/order.js | 27 ++--- src/gonganxitong/place.go | 13 +-- src/gonganxitong/placeUser.go | 7 +- src/gonganxitong/placeUser.js | 13 ++- src/gonganxitong/portal.css | 11 +- src/gonganxitong/portal.go | 9 +- src/gonganxitong/portal.js | 77 +++++++------ src/gonganxitong/portal.json | 16 +-- src/gonganxitong/sess.go | 2 +- src/gonganxitong/user.go | 4 - src/gonganxitong/userPlace.go | 6 +- .../web.team.gonganxitong.portal/hash.json | 12 +- 27 files changed, 300 insertions(+), 253 deletions(-) delete mode 100644 src/gonganxitong/icons/apply.png delete mode 100644 src/gonganxitong/icons/event.png delete mode 100644 src/gonganxitong/icons/house.png delete mode 100644 src/gonganxitong/icons/office.png delete mode 100644 src/gonganxitong/icons/order.png diff --git a/src/gonganxitong/apply.go b/src/gonganxitong/apply.go index 01e39a3..6d17ec2 100644 --- a/src/gonganxitong/apply.go +++ b/src/gonganxitong/apply.go @@ -13,70 +13,34 @@ type Apply struct { event event portal string `data:"true"` domain string `data:"gonganxitong"` - create string `name:"create place_uid* user_place_role*:select begin_time:select@date end_time:select@date" role:"void"` - list string `name:"list place_uid uid auto" role:"void" help:"权限申请" icon:"https://img.icons8.com/officel/80/edit-property.png"` + create string `name:"create user_place_role*:select begin_time:select@date end_time:select@date" role:"void"` + list string `name:"list place_uid uid auto" help:"权限申请" icon:"https://img.icons8.com/officel/80/edit-property.png" role:"void"` cancel string `name:"cancel" role:"void"` submit string `name:"submit" role:"void"` } -func (s Apply) Inputs(m *ice.Message, arg ...string) { - s.Place.(interface{ Inputs(*ice.Message, ...string) }).Inputs(m, arg...) -} func (s Apply) Init(m *ice.Message, arg ...string) { s.Table.Init(m, arg...) - place_uid := s.Keys(s.Place, model.UID) - user_place_role := s.Keys(s.UserPlace, model.ROLE) - m.Design("create", "", place_uid+"* "+user_place_role+"*:select") - m.Design("list", "", place_uid+" uid auto") + 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") +} +func (s Apply) Inputs(m *ice.Message, arg ...string) { + s.Place.(interface{ Inputs(*ice.Message, ...string) }).Inputs(m, arg...) } func (s Apply) Create(m *ice.Message, arg ...string) { arg = kit.TransArgKeys(arg, s.Keys(s.Place, model.UID), model.PLACE_UID) arg = kit.TransArgKeys(arg, s.Keys(s.UserPlace, model.ROLE), model.ROLE) arg = kit.TransArgValueTime(arg, model.BEGIN_TIME, model.END_TIME) - s.Table.Create(m, kit.Simple(arg, m.OptionSimple(model.USER_UID), "tables", s.Keys(s.Place, model.UID), model.STATUS, ApplyCreate)...) -} -func (s Apply) Cancel(m *ice.Message, arg ...string) { - msg := s.status(m, ApplyCreate, ApplyCancel) - s.SendTemplate(m, "", msg.Append(model.USER_UID), "权限申请 已取消") -} -func (s Apply) Submit(m *ice.Message, arg ...string) { - msg := s.status(m, ApplyCreate, ApplySubmit) - if m.WarnNotValid(msg.IsErr()) { - return - } - defer s.event.Record(m, m.Option(model.UID)) - defer m.ToastProcess()() - role := UserPlaceCreator - switch UserPlaceRole(kit.Int(msg.Append(model.ROLE))) { - case UserPlaceLandlord: - role = UserPlaceCreator - case UserPlaceTenant, UserPlaceAdmin: - role = UserPlaceLandlord - } - msg = m.Cmd(s.UserPlace, s.Select, m.OptionSimple(s.Keys(s.Place, model.UID)), model.ROLE, role) - if m.WarnNotFound(msg.Length() == 0, role.String()) { - return - } - m.Cmd(Order{}, s.Create, msg.AppendSimple(model.USER_UID), model.APPLY_UID, m.Option(model.UID), model.STATUS, OrderCreate) - s.SendTemplate(m, m.Cmd(s.user, s.Select, model.UID, msg.Append(model.USER_UID)).Append(model.NAME), m.Option(model.USER_UID), "场所权限申请 已提交") -} -func (s Apply) Reject(m *ice.Message, arg ...string) { - msg := s.status(m, ApplySubmit, ApplyRejected) - s.SendTemplate(m, "", msg.Append(model.USER_UID), "权限申请 已驳回 ❌") -} -func (s Apply) Approve(m *ice.Message, arg ...string) { - msg := s.status(m, ApplySubmit, ApplyApproved) - s.SendTemplate(m, "", msg.Append(model.USER_UID), "权限申请 已通过 ✅") - m.Cmd(s.UserPlace, s.Create, msg.AppendSimple(model.USER_UID, model.ROLE), s.Keys(s.Place, model.UID), msg.Append(model.PLACE_UID)) + s.Table.Create(m, kit.Simple(model.PLACE_UID, m.Option(s.Keys(s.Place, model.UID)), arg, m.OptionSimple(model.USER_UID), model.TABLES, s.Keys(s.Place, model.UID), model.STATUS, ApplyCreate)...) } func (s Apply) List(m *ice.Message, arg ...string) { - s.Tables(m, s.user).FieldsWithCreatedAT(m, s, - model.USER_AVATAR, model.USER_NAME, + s.Tables(m, s.user).FieldsWithCreatedAT(m, s, model.USER_AVATAR, model.USER_NAME, s.AS(s.Key(s, model.ROLE), s.Keys(s.UserPlace, model.ROLE)), model.APPLY_STATUS, - model.BEGIN_TIME, model.END_TIME, - model.PLACE_UID, + model.BEGIN_TIME, model.END_TIME, model.PLACE_UID, ) if len(arg) == 0 { + return if m.IsTech() { s.Select(m) } @@ -93,7 +57,7 @@ func (s Apply) List(m *ice.Message, arg ...string) { ApplyCancel.String(), }, ice.STR_R) } else if len(arg) == 2 { - s.Table.SelectDetail(m, model.PLACE_UID, arg[0], s.Key(s, model.UID), arg[1]) + s.Table.SelectDetail(m, model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, arg[0], s.Key(s, model.UID), arg[1]) if ApplyStatus(kit.Int(m.Append(model.APPLY_STATUS))) == ApplySubmit { m.EchoQRCode(Portal{}.Link(m, arg[0], m.Prefix("order"), arg[1])) } @@ -108,21 +72,47 @@ func (s Apply) List(m *ice.Message, arg ...string) { m.PushButton() } }) - m.Info("what %v", m.FormatMeta()) - s.UserPlace.(interface { - RewriteAppend(*ice.Message, ...string) *ice.Message - }).RewriteAppend(m) - m.Info("what %v", m.FormatMeta()) - m.Info("what %v", m.FormatMeta()) + s.UserPlace.RewriteAppend(m) s.Display(m) } +func (s Apply) Cancel(m *ice.Message, arg ...string) { + msg := s.status(m, ApplyCreate, ApplyCancel) + s.SendTemplate(m, "", msg.Append(model.USER_UID), m.Trans("role apply cancel", "权限申请 已取消")) +} +func (s Apply) Submit(m *ice.Message, arg ...string) { + msg := s.status(m, ApplyCreate, ApplySubmit) + if m.WarnNotValid(msg.IsErr()) { + return + } + defer m.ToastProcess()() + role := UserPlaceCreator + switch UserPlaceRole(kit.Int(msg.Append(model.ROLE))) { + case UserPlaceLandlord: + role = UserPlaceCreator + case UserPlaceTenant, UserPlaceAdmin: + role = UserPlaceLandlord + } + msg = m.Cmd(s.UserPlace, s.Select, m.OptionSimple(s.Keys(s.Place, model.UID)), model.ROLE, role) + if m.WarnNotFound(msg.Length() == 0, role.String()) { + return + } + m.Cmd(Order{}, s.Create, msg.AppendSimple(model.USER_UID), model.APPLY_UID, m.Option(model.UID), model.STATUS, OrderCreate) + admin := m.Cmd(s.user, s.Select, model.UID, msg.Append(model.USER_UID)).Append(model.NAME) + s.event.Record(m, kit.Format("🕑 %s"+m.Trans(" apply submit", "权限申请提交"), s.TransRole(m)), m.Option(model.UID)) + s.SendTemplate(m, admin, m.Option(model.USER_UID), m.Trans("role apply submit", "权限申请 已提交")) +} +func (s Apply) Reject(m *ice.Message, arg ...string) { + msg := s.status(m, ApplySubmit, ApplyRejected) + s.SendTemplate(m, "", msg.Append(model.USER_UID), m.Trans("role apply rejected", "权限申请 已驳回")) +} +func (s Apply) Approve(m *ice.Message, arg ...string) { + msg := s.status(m, ApplySubmit, ApplyApproved) + m.Cmd(s.UserPlace, s.Create, msg.AppendSimple(model.USER_UID, model.ROLE), s.Keys(s.Place, model.UID), msg.Append(model.PLACE_UID)) + s.SendTemplate(m, "", msg.Append(model.USER_UID), m.Trans("role apply approved", "权限申请 已通过")) +} func init() { ice.TeamCtxCmd(Apply{Table: newTable()}) } -func NewApply(userPlace, place ice.Any, street Container) Apply { - return Apply{Table: Table{UserPlace: userPlace, Place: place, Street: street}} -} - func (s Apply) status(m *ice.Message, from, todo ApplyStatus, arg ...string) *ice.Message { msg := s.Table.Select(m.Spawn(), m.OptionSimple(model.UID)...) if !m.WarnNotFound(msg.Length() == 0, m.Option(model.UID)) { diff --git a/src/gonganxitong/apply.js b/src/gonganxitong/apply.js index 19c3e63..bf21387 100644 --- a/src/gonganxitong/apply.js +++ b/src/gonganxitong/apply.js @@ -1,20 +1,22 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { if (msg.IsDetail()) { return msg.Dump(can) } - var PLACE_NAME = msg.Option("_place_name") - var PLACE_TYPE = PLACE_NAME.replace("_name", "_type") - var USER_PLACE_ROLE = "user_"+PLACE_NAME.replace("_name", "_role") - var STREET_NAME = msg.Option("_street_name") - can.page.Append(can, can._output, msg.Table(function(value) { value._style = [value.place_type, value.user_place_role, value.apply_status] - return can.onimport.itemcard(can, value, [ + _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" + if (msg.IsDetail()) { can.onexport.share_title(can, msg, USER_PLACE_ROLE); return msg.Show(can) } + can.onimport.itemcards(can, msg, function(value) { value._style = [value[PLACE_TYPE], value[USER_PLACE_ROLE], value[APPLY_STATUS]] + var status = value[APPLY_STATUS] + return [ {view: html.TITLE, list: [{text: value[PLACE_NAME]}, {text: [can.user.transValue(can, value, PLACE_TYPE), "", mdb.TYPE]}, - {text: [can.user.transValue(can, value, USER_PLACE_ROLE), "", aaa.ROLE]}, - {text: [can.user.transValue(can, value, "apply_status"), "", mdb.STATUS]}, + {text: [can.user.transValue(can, value, USER_PLACE_ROLE), "", [aaa.ROLE, value[USER_PLACE_ROLE]]]}, + ]}, + {view: html.STATUS, list: [ + {text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}, + {text: [can.user.transValue(can, value, APPLY_STATUS)+" "+(status == "create" || status == "submit"? "🕑": status == "rejected"? "❌": "✅"), "", mdb.STATUS]}, ]}, - {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}]}, {view: html.STATUS, list: [{text: value.begin_time.split(" ")[0]}, {text: value.end_time.split(" ")[0]}]}, {view: html.STATUS, list: [{text: value.city_name}, {text: value[STREET_NAME]}]}, - ]) - })) + ] + }) }, }) \ No newline at end of file diff --git a/src/gonganxitong/city.go b/src/gonganxitong/city.go index 684f566..ca0a184 100644 --- a/src/gonganxitong/city.go +++ b/src/gonganxitong/city.go @@ -18,7 +18,3 @@ func (s city) FindOrCreateByName(m *ice.Message, arg ...string) { arg[0], arg[1] = model.CITY_UID, msg.Append(model.UID) } } - -type City struct{ city } - -func init() { ice.TeamCtxCmd(City{}) } diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index ca3e207..c3b380b 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -4,17 +4,28 @@ import ( "path" "shylinux.com/x/ice" + icebergs "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/web" kit "shylinux.com/x/toolkits" + // "shylinux.com/x/toolkits/logs" "shylinux.com/x/community/src/gonganxitong/model" "shylinux.com/x/mysql-story/src/db" ) +type Tabler interface { + RewriteAppend(m *ice.Message, arg ...string) *ice.Message + TransValue(m *ice.Message, key string, arg ...string) string + TransRole(m *ice.Message, arg ...string) string +} +type Container interface { + FindOrCreateByName(m *ice.Message, arg ...string) +} + type Table struct { db.Table - UserPlace ice.Any - Place ice.Any + UserPlace Tabler + Place Tabler Street Container inputs string `name:"inputs" role:"void"` list string `name:"list place_uid uid auto" role:"void"` @@ -42,15 +53,33 @@ func (s Table) Inputs(m *ice.Message, arg ...string) { } } func (s Table) List(m *ice.Message, arg ...string) *ice.Message { - if len(arg) == 0 || len(arg) == 1 { + if len(arg) == 0 { if m.IsTech() { - s.Table.List(m) + s.Table.Select(m) } + } else if len(arg) == 1 { + } else if len(arg) == 2 { s.Table.SelectDetail(m, model.UID, arg[1]) } return m } +func (s Table) TablesWithRole(m *ice.Message, arg []string, target, userGroup, group Tabler, fields ...ice.Any) *ice.Message { + s.Tables(m, kit.JoinWord("LEFT JOIN", s.TableName(kit.TypeName(userGroup)), + "ON", s.Key(target, model.USER_UID), "=", s.Key(userGroup, model.USER_UID), + "AND", s.Key(target, s.Keys(group, model.UID)), "=", s.Key(userGroup, s.Keys(group, model.UID)), + )).FieldsWithCreatedAT(m, target, append([]ice.Any{s.Key(target, model.USER_UID), s.AS(s.Key(userGroup, model.ROLE), s.Keys(userGroup, model.ROLE))}, fields...)...) + if len(arg) == 1 { + s.Table.Select(m, s.Key(s, s.Keys(group, model.UID)), arg[0]) + } else if len(arg) == 2 { + s.Table.Select(m, s.Key(s, s.Keys(group, model.UID)), arg[0], s.Key(s, model.UID), arg[1]) + } else { + return m + } + s.SelectJoinUser(m) + group.RewriteAppend(m) + return m +} func (s Table) SelectJoinUser(m *ice.Message) *ice.Message { return s.SelectJoin(m, user{}, model.NAME, model.AVATAR) } @@ -67,15 +96,29 @@ func (s Table) RewriteAppend(m *ice.Message, arg ...string) *ice.Message { }) return m } +func (s Table) TransValue(m *ice.Message, key string, arg ...string) string { + if value := kit.Select(m.Option(key), arg, 0); m.IsEnglish() { + return value + } else { + return kit.Select(value, kit.Value(m.Target().Commands[m.CommandKey()].Meta, "_trans.value."+key+"."+value)) + } +} +func (s Table) TransRole(m *ice.Message, arg ...string) string { + value := kit.Select(m.Option(s.Keys(s.UserPlace, model.ROLE)), arg, 0) + role := s.Place.TransValue(m, s.Keys(s.UserPlace, model.ROLE), arg...) + return kit.Format(`%s`, value, role) +} func (s Table) SendTemplate(m *ice.Message, from, user_uid, title string) { if !m.IsErr() { m.Cmd(user{}, user{}.SendTemplate, from, user_uid, Portal{}.Link(m, m.Option(s.Keys(s.Place, model.UID)), m.PrefixKey(), m.Option(model.UID)), - title, m.Option(s.Keys(s.Place, model.NAME))+" "+m.Option(s.Keys(s.UserPlace, model.ROLE)), kit.Cut(m.Option(model.UID), 6)) + title, m.Option(s.Keys(s.Place, model.NAME))+" "+s.Place.TransValue(m, s.Keys(s.UserPlace, model.ROLE)), kit.Cut(m.Option(model.UID), 6)) } } func (s Table) Display(m *ice.Message) { m.Option("_place_uid", s.ToLower(kit.TypeName(s.Place))+"_uid") m.Option("_place_name", s.ToLower(kit.TypeName(s.Place))+"_name") + m.Option("_place_type", s.ToLower(kit.TypeName(s.Place))+"_type") + m.Option("_user_place_role", s.ToLower(kit.TypeName(s.UserPlace))+"_role") m.Option("_street_name", s.ToLower(kit.TypeName(s.Street))+"_name") m.Option(ice.MSG_USERPOD, "20240724-community") m.Display("/p/src/gonganxitong/" + m.CommandKey() + ".js?pod=20240724-community").DisplayCSS("") @@ -84,7 +127,7 @@ func (s Table) Display(m *ice.Message) { type Tables struct { Table Portal Portal - list string `name:"list place_uid auto" role:"void"` + portal string `data:"true"` } func (s Tables) Init(m *ice.Message, arg ...string) { @@ -100,17 +143,13 @@ func newTables() Tables { return Tables{Table: newTable()} } func newTable() Table { return Table{UserPlace: userPlace{}, Place: place{}, Street: street{}} } -func NewTable(userPlace, place ice.Any, street Container) Table { +func NewTable(userPlace, place Tabler, street Container) Table { return Table{UserPlace: userPlace, Place: place, Street: street} } -func NewPortal(userPlace, place ice.Any, street Container) Portal { +func NewPortal(userPlace, place Tabler, street Container) Portal { return Portal{Table: Table{UserPlace: userPlace, Place: place, Street: street}} } -type Container interface { - FindOrCreateByName(m *ice.Message, arg ...string) -} - func (s Portal) getTable() Table { return s.Table } func PortalCmd(portal ice.Any) { @@ -119,6 +158,16 @@ func PortalCmd(portal ice.Any) { cmd := func(name string, data ice.Any) { _, cmd := ice.Cmd(kit.Keys(p, name), data) cmd.RawHand = path.Join(path.Dir(h), name+".go") + if name != "portal" { + // return + } + h := cmd.Actions["beforeMigrate"].Hand + cmd.Actions["beforeMigrate"].Hand = func(m *icebergs.Message, arg ...string) { + msg := m.Cmd("web.team.gonganxitong.apply") + ice.LoadTrans(msg, cmd) + ice.LoadTrans(m, cmd) + h(m, arg...) + } } table := portal.(interface{ getTable() Table }).getTable() cmd("portal", portal) diff --git a/src/gonganxitong/email.go b/src/gonganxitong/email.go index e319222..c5ad875 100644 --- a/src/gonganxitong/email.go +++ b/src/gonganxitong/email.go @@ -12,15 +12,19 @@ import ( ) type email struct { - user user - portal Portal - creds emails.Creds - apply string `name:"apply username* password*" role:"void"` - reset string `name:"reset password*" help:"重置密码" role:"void"` + Tables + user user + creds emails.Creds + apply string `name:"apply username* password*" role:"void"` + reset string `name:"reset password*" help:"重置密码" role:"void"` } -func (s email) Init(m *ice.Message, arg ...string) { - s.portal.Show(m) +func (s email) List(m *ice.Message, arg ...string) { + if msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)); msg.Append(model.EMAIL) == "" { + m.EchoInfoButton(m.Trans("please apply email", "请申请邮箱"), s.Apply) + } else { + m.EchoInfoButton(msg.Append(model.EMAIL), s.Reset) + } } func (s email) Apply(m *ice.Message, arg ...string) { defer m.ToastProcess()() @@ -42,12 +46,5 @@ func (s email) Reset(m *ice.Message, arg ...string) { } m.Cmdy(s.creds, s.creds.Password, msg.Append(model.EMAIL), m.Option(aaa.PASSWORD)) } -func (s email) List(m *ice.Message, arg ...string) { - if msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)); msg.Append(model.EMAIL) == "" { - m.EchoInfoButton(m.Trans("please apply email", "请申请邮箱"), s.Apply) - } else { - m.EchoInfoButton(msg.Append(model.EMAIL), s.Reset) - } -} func init() { ice.TeamCtxCmd(email{}) } diff --git a/src/gonganxitong/event.go b/src/gonganxitong/event.go index 39a4bb8..8638a08 100644 --- a/src/gonganxitong/event.go +++ b/src/gonganxitong/event.go @@ -12,15 +12,15 @@ type event struct { Table user user portal string `data:"true"` - list string `name:"list auto" help:"事件流" icon:"https://img.icons8.com/officel/80/property-with-timer.png"` domain string `data:"gonganxitong"` + list string `name:"list place_uid uid auto" help:"事件流" icon:"https://img.icons8.com/officel/80/property-with-timer.png"` } func (s event) List(m *ice.Message, arg ...string) { s.Tables(m, s.user).FieldsWithCreatedAT(m, s, model.USER_AVATAR, model.USER_NAME, ctx.INDEX, model.OPERATE, ctx.ARGS, model.INFO, - s.Key(s, model.UID), model.USER_UID, + model.USER_UID, ) if len(arg) == 0 { if m.IsTech() { @@ -29,17 +29,14 @@ func (s event) List(m *ice.Message, arg ...string) { } else if len(arg) == 1 { s.Select(m, model.PLACE_UID, arg[0]) } else if len(arg) == 2 { - s.Select(m.FieldsSetDetail(), s.Key(s, model.UID), arg[1]) + s.SelectDetail(m, s.Key(s, model.UID), arg[1]) } + m.PushAction().Action() m.Display("") } func init() { ice.TeamCtxCmd(event{}) } -type Event struct{ event } - -func init() { ice.TeamCtxCmd(Event{}) } - func (s event) Record(m *ice.Message, info string, arg ...string) { m.Cmd(s, s.Create, m.OptionSimple(model.USER_UID, model.PLACE_UID), model.INFO, info, ctx.INDEX, m.PrefixKey(), model.OPERATE, m.ActionKey(), ctx.ARGS, kit.Join(arg, ",")) } diff --git a/src/gonganxitong/event.js b/src/gonganxitong/event.js index 634abc3..a7aa2b3 100644 --- a/src/gonganxitong/event.js +++ b/src/gonganxitong/event.js @@ -1,13 +1,14 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { if (msg.IsDetail()) { return msg.Dump(can) } - can.page.Append(can, can._output, msg.Table(function(value) { - return can.onimport.itemcard(can, value, [ + _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"), ORDER_STATUS = "order_status" + if (msg.IsDetail()) { can.onexport.share_title(can, msg, USER_PLACE_ROLE); return msg.Show(can) } + can.onimport.itemcards(can, msg, function(value) { + return [ {view: html.TITLE, list: [{text: value.user_name}]}, {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}]}, - {view: html.STATUS, list: [{text: value.index}, {text: value.operate}]}, - {view: html.STATUS, list: [{text: value.args}]}, {view: html.OUTPUT, list: [{text: value.info}]}, - ]) - })) + ] + }) }, }) \ No newline at end of file diff --git a/src/gonganxitong/express/express.go b/src/gonganxitong/express/express.go index b7f18e7..8b8cade 100644 --- a/src/gonganxitong/express/express.go +++ b/src/gonganxitong/express/express.go @@ -1,18 +1,10 @@ package express -import ( - "shylinux.com/x/ice" - - "shylinux.com/x/community/src/gonganxitong" -) +import "shylinux.com/x/ice" type express struct { Table - portal gonganxitong.Portal -} - -func (s express) Init(m *ice.Message, arg ...string) { - s.portal.Show(m) + portal string `data:"true"` } func init() { ice.TeamCtxCmd(express{}) } diff --git a/src/gonganxitong/icons/apply.png b/src/gonganxitong/icons/apply.png deleted file mode 100644 index 3500f1b813beda7c37f88f70a23b0aae750ac436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4840 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 diff --git a/src/gonganxitong/icons/house.png b/src/gonganxitong/icons/house.png deleted file mode 100644 index 82c849382c3b3b8fb47903cc987089405b84f6fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6121 zcmYj#c_5Ts*uD&g!C+(`ObmwX#1I;cHAxFnQdvq_2bHXiEHjv4WQ}4-n=MP0>x{6_EZd%y3G=b7i3`&{Q-_jTX*InOzG8*4LekSK_WiHY079DR}TOJ!WO z>}-rXY;|CRiAm_a1={d(VAl7EP~YSCpEYgVkzGq%PkPMDob-P4UbAdNR$Q^%8@FTk zBfOQa70gXUj5kmp@gDXo6rH?(uuxq5Q}ex3^@o6scaHDIuL)EeBkxDux4&YdrBKVx z!og>RnlyrJzE}!#uprx-r(f9hDTq8b;e51kY{KNBd%-yM@qvztB)#g~C zb~CdlN$j2kv{b^-kiH*tx-=BW{o#X(ZHF^}8@XN1Kj41h-1UiXT2PHlB(K8T5alFNY3^i-#y>QTuuO#VgVdHU)KP$nN-@-V6@7W>4KxNyF5VpaiB8*2$A>?w*KMD z5zgjX?c0kNlFtjUw$m>)?s?9%e;C?L(P_ed)ePwTJzc(QS;ia!hhV#eSBKpz-VAr= zuWCxhs#i-a0P+&NC#pB(#MZ|=g@N?k`^$f}92{Tvp+pDf6x-8MuY@;ZOCk%L)!a0| z9}L>61vBv{x#Ckb%jGkf`6y(%d9;Yq-P@NcS(2o{0%j3^En>`SA~6cvBw>c-=@g(; zI7Z>~zc1NgqxkKINHkgf{0MM%?7j&RP|8+X8T zmwRj1aZNrdrWn^04D2?&+WUckV𝔧II7e{gabXQ+%N7a40TrUl2Efv^!{hZgVk< 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 diff --git a/src/gonganxitong/icons/office.png b/src/gonganxitong/icons/office.png deleted file mode 100644 index 4fcb7d37068e3065a643698687fe412de09a86e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4370 zcma)AdpwhU|F;7}KeJ`3JEMy!hf0wg z;wB3b${}HMb~{_5^5pqm)BU`j*Ynr!kA3&LzUS-ndB5ME_ZEA=#zIDVt+be!n2aUW z+#Y=MkdLGUXmg$NxME_2PD}Hh2QS>7=nnP0F^H<2d3eM5)#1Cl?mb#_9Mc(Dd?D7l z+1mqe+xOg5-j4dZHB^;~-)H{c`M^XElxNx9$P{L) zw9n0>IR|u1L&Ha6Yx{qirOaPUpAWJ5`E!G*N$n29rcq(oK;cwqkHh-Z_9I7>^0Z0c zv^7Z5H0i^RH=LXuw~b`AwVifN4!$`oS$*?i$eoN3Hnym2^>Y@dt^jZ-8 z^YdlGjucm-W3E$4;rB43<4P1lf+cikHbHKH=5Cepi!;`5q{FCHWk)Vj^wBfxR=+uk zT^W8^98@P@_%SetgFIYa1yg5vDt+}@Xl244>@Em7Jyb&LZztXSXJD~6n*8$1Q zB@0MHh5c(CGm{1Xh`@4G1kTR$b>00B{S~h6CL;YGjZ0y z`qS*OA3Y(%yF(PfI;yz)=R(WAA7g0)tf(*740IBUW{A`{$;?>_A%;jDw1Dswc3lEY z-V5DW$27bOZ`^^VI~{_}7VbKacNMwDKg(VSmQm0*@9}7#>`squ&amLw>A$+ARz9Ca zWc}45_I*)!Z04iGSoM#&v_aG4^J?jfe)LN5b2Za~-GgNdlGP`?8DB!Dq$hT6Ox7Vk zaw(o(X%q*}OD6Fi=lc_7O$(32r;h2o9@nDRX>1u#HwMSsLyr&n5gyYj)GZp$3x_V! zj$RPV4 zJLfSP%8KniDt1E_L%B}(kBx**dM6hJjfTsY9p9OeYS!(~Es^ow(q#HGYN0DyXC|Q{ zFKPb1LoTM}eGF`G4*gVvT> z1F#%j_E|CuM#samn3Yi&BJ~ZCY6kZOKxipLG+owQ)D?wx@1rVDR=AXX7*uFd?S%sk z2~6x!Ntkic<4*WJD+8{#88elSY*@}D(V^~Ls|~pO%NePnGt7{)N}}Gref}QD-ahH0 z|CTAK$`3Ub^{3dB%WKS>@OAcn?w7xJw0-)d{cW;a z*P?mb)~nmY^t{sog-_B0^oqPkguLm$VkWeXg++-Tt)w$^{jQCShgkqb zyiLfLFY5UrXA~EYfJHKb+NAr*82T>=G|00x^ZiKYJWhp*HO@1u`bH_XUvjygt^0$7 zT7ki_Hxj1d6Ko>u54H-PtlWMl`3wf@DaXGr<0ng?f_^2c20lriz<;A*a3^1mT0ms2 zr5fRr#KClP2xS4y!1n|07Q*}JqEy66tc<}tK-tHOQp7W0J_@*-31)}}zZ(-2@kv-J zd3mKPO0SaX3uY`2qFEYvcZ_+=a&j{s?RZ(a2De$O4`3^yN0F~ zvihiroe>gZ+9-U`@PIu;H$1=zxv!4!Cy&D%3An2Y`q>jEcA`YkvSI50$Qd#w^E|jz z5s@5K2o7YP1WO9Lc_NWXx8cWY8FF+{Z2WJ#f6sSxI2D<3hm{07lBkSE^O61_qW|ycdkD- z#idoXr)xbfdg4d1v#+nKnnm+Jfj-gsK%`n$((Z$G5wXMEu_Qnk5x_y>WX+2Am45qt zsPYTVb;lvCBU@eL?*qMFFCN)0DD~QHHj}dfB-6d~*~6Nw{ZsYCbBem3`A;)pZrH4N zbI-3^WW9F9(D4g&;rrF^>;kcU1)1=I^ON7{euZ`mo%wtBEWbB-=}|;hHbUmlFCM;j z{yNzOXfAlh-L`E=XkL189`=zU&l35X2cYA%Z~KiZG#&&%&G% z&jii3CO1UA7)kx`Vc$}Fvib^S!YZNGH5lE9Ly|x7R)kcaILu9d696F+!f9jMRsf)* zsGCby_R<5aFX`dkpUwCNKyna8O@B>4yg^tP3vMq@NOs9N4`cf_p`~{GlVU%=(+heZ zjB0{OfBvJ5FJ4fp`)X)BBxA_bV}+G~r~jp=rDJqKm6fOv0+1{!n^r7~E^uhe`_tfn zPk~5gN-zP%J|%v^MR|m!?v+c=Iafkv;d?GSZFNY1y?L+KL~0Xmo6Yh!|EqRgM}r)Z z`cmBV6@ej!vsu@yT_^)Yag?$lUDnMQWQF6m)3(t7sA8tGmjkp1kWEt6@pnzpN7=_= zfP>1cTMfz>wdjK}GzfS?pyq^$#a4mxl8Z))8kn&03}7qU|6V@>Bn?=$>^eD?G_FNE zkVKFNl*V#$N*N;opmL>Pntx9~l9TB?Vh?Rt-ts6$uLh}DShwG2u4lInZv}BKiIN~F zEZ-}SQ84~Ls>VTwd~F`CLHr5pRbF}c6Q@G2^4|sLKY9p4xNY0+>N~;5w1FjL{Uxco z2z)f?#rEleRG?>4H6eA%VzR3hdQH&#YlC*#18|UZFQnEM)ib zC^7Zd%jbJ~mCy7){(HNs+4pIRQJnwu2W7XafmpYyh2~jqd4gGw_P04DcE-ZNDdnBd zZEkBs%P6W^{0;h&5{j(i`!q??ZWitONQE>RlI9K4eo=34^^E%vWw1lA{{a0OS;c&A zsic|`aYSQk56vKiV>s`*zpwhw5DPh_6$#nWQ;{EC)E0sxyjGoze#cY^tD3UviW=$E zovOY(T+~1D-fb?isXi1$qc#j(xwj_z+KM#K_%B}-ddFA#$!6jrYpYJ?pz)9(5GZZ}=-Et&&78mP5j|_>~w!FGUrh2QILCdZK@0uZg-0!DN+^gQF2X zvn$XJ=7{`G$nw=ReT1MKPdi<(cC$fMeGOy-_%Zz4shs@qJTwQ33-{l5Ry??C7)QP{``s^mM*iv3vfaN@MgZtTP*1x} z_K+8po#to6=rE@behK@gyApBS;n%uEYQZ219Dlr(LtYu9MRc2|_ z0PmAo!?b30m{o|pZR2`&=flRApG`Wp4jQs$*jk809u}n!I2}V?&2Yo!9xwNX=_}>ERf%@Lh8L}4HEE>E@%Zt?d z(13T{*mtcw-W@$qR1wGZJZMa&;;`$~eK>f;;tHj(X?tTZr=+T}xH>ct7$k`+B=xUJ zAzsjdtga0jBx?W|Yr*3RNZ;_lTF@YV8$i+97x9F?bO1JA#26NvFpsx(00YBNtz>e< zEJdCUfG%wV*pNiEC-YW;25hJUV7}GzKQRM=6IGhyt(k~b6om^kNI5|p`TOkl0WO8Q z3VB-)EKq%bvgf?xHYYmt!&&e%pses@@#B9&M7aIrQHj^3{TpDN@*IsV;DybDn+Qi-rK+G$SQD9>vRLpMhXEPh5~^*J X*O1HNrX=uRhnVFa8}qzf$0Pp@WmTgu diff --git a/src/gonganxitong/icons/order.png b/src/gonganxitong/icons/order.png deleted file mode 100644 index 00a4f28b128b31873fef978d0d32742b46caa45b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4212 zcmbtYc|25o+n2Enja|%*7)E5w9V%HOV;@l>jUmMtBuiw8h&tA>kI@t*9$Rvc!O$RE zF=GkQZ7XFRS(7y(+dJO(dH;IEisj>8Mg!=_YhSq=w>@OcXpL%Y!IAEQD(H?AFNUk&8nVa#O+xK<8!Ty&FOwf^jK zi3j&{h{F)~mEyu7;sF1Hf36P5H!GS>L$y?=g6k6UxVbH2=)+u5&l(e1uVd)|6vHd- z_T2A~Q-D426*`&7F5VA8?c=98wHR-rK^Y|O5 z9ubrM66+#c@6%aU65ih8;vH{hbDp=o=8or#_EapDA4WZrkQ z?pjcAFfO=($y0f|Uuh#3Z(0~Km7>M3C(^zU3W-tD=P@d5MiI_J!Rb68`92r61V{`z z8W6s%F03H%?=ZJqM(cv}3kpE0iC@0Zy<4NWk5;Vlf>wbgm~Cx~UJZmv{Fhh4&NFmg z=NZiy4x^(nq@@4Ay8r9fYIE6*dJ{iCHHfD(j)c+*>s&Af4k#r-F% zP&uY-gODruNQ?ydgd`i`&vn6+xrK$6i-e}8rU+}jRi+Zs97gPU^5jX_VGwP++Wm!1 zC923!uxXJrUY<24E`f)Mb03SZ3wVvImICFSv_q?$QQ(1sW2qM}I;gou0ar4IV5z#@ zv}V*vq=0QFS;2$N%rk6L7mNk2eEgy@po($mrZG?_(X>=!98CQ29msb-t{L_Q7$F!u z?a7ewhQvf&k;ezX)#Z4MA}J(|I+08vP~Jg*e?MGTSJy1gQFXz*f3`a-nk;-&0x4W| zt5-Jb26M^Gi}xMd_hif;KYcnC!U``pjt8t<7j8s6*YcCi zQg$6Gb!gn#Tz<=aU?8w{+D0)>gX!dIs!p<%y{osiEWnxWtj|IGv*d0_2lR0cd~IiSBmfYf(pugkbag*rEY0r z<=Zt7NoWL1h7UwTeFUr&1vj#=iDAPb*{;VAw}`+i`;q~5@_x&GR^m}xRz|S^;db;g z|KD$g-X870bu?jh=Ig3C~T@&K=Ce#{yUw0X0CeLkMn= z%6hVjs#@DLb0vxeUr$h41cbUmn&{gfpO-Jn`kTnslI$jWpNVL+ppcJv1tK?|e!-OF zRjmZBGmXbHF***FSr>uc*cFBk_i=P-BifZlkH12ipNZ0@K=;-VMYjt01kL{bQd-NVZP9JM)m#5s+g9$&JF@Rj=${%@g}eWM?g*vwK0_2mHtzlL*@+ z3Oa>wL`Ef$Z8P@N_%B2UrTvxD<)GYy7dclef?`q6LQ)Aeh$FZNCN ze6uy*{Vn~{D0Gxgyz)G@9|RnJCkjwVTtYO-MG6S8L(PzN{%QIuZ8&IzHw#t69_cHi4A(K@{y-+~hLWVdqGd*xha z=P0S_@<`2OT!x<9JF(T88;tXRJ^Z_d%TjH$HmsW|a}=TotnGEw2lTu5-)t;%U6`%- zc`3ws>4n<(r;xB-`QG@1y08J(f(@MAt`zMqrR*1nk$L^HY4tv1e79V6aC_0NpVq#N zao1^2{IEmN)i28(Fi@iW_URxpnH=Ehc`{Z_|HkHaN%_dn*4sIos#c3Tu$rCUbxmn< z+L`MQgb22Fc6Nh(eYR?@F@WM#t+=Zg%*?ldHv(91@`v-ZO>=wehnrKy9aSquG^fk5 zo?q^UF7H`y&hCxlya$u1WVmY_`?V9Y#FWgzw4AdFq+{5b;J@=#mZ^0?3-!5rRCKuM zyj(})=7aAOyg~*$lMeT*?F#B>bi@ayr?+MzplD5gTzOMwTDzw^CnqOanB@b3FQo3= zn#rjs-#w%3VSqtyPS!A+_eZ)@_1|1Q*i8fa>n}jtmNOZfR{@H-8Iwo{UOh!9uK@3d z9O~~;KaGE%Ep}9KPk}Q2FjtIBm|9Q8J4h3jZY8ohmZzrj4ZZeLQOdjMf%Siowc}GV z@ku}ob9w5FnHUR=9|{n*@bmL)oDU@Ng-Y9}o-LE{J#3wP3FGav&>v7i&iAh8qL$$) zB{w}UjQDb%WAWX;q!ee}F{(}^ZbdvuMQEqmq@D@TENL4olybhTE&f1g0fEVgp|sJU zX!P!d3m;P^Ck%Bac@>wQmdeP=mbI<0H{w^w7=;=~h@$K>;rKB1oi?3Hdf3sfENEGxHHnoa zm#w!}{wQFTPv&LEtA#M1iCbqY~Q1ArlV5_UHULkhqwMQ>PG>!UVvW_n0UFkz#lS{zE*qD|&&abDu zv#Aa9>75Qp{TMp;{0vj4b{W^=Pbs?jJLSW8!crXYxxn!E1Gv99tD~N7s|BLiTQNGF z+Q)Er_kLd}ZJ6vGh@*5UAn^&n=R7{4!m}RZ+l_Ro@9C0)NzP3x@@yn-QA`yz72^1H z71*tRtNb{lIr?PMaLA$7?OJ+3LAB$-$oUv@P3;{z6#Y6X6;5PBWHIKYL7WT1YcBxN z!y)eO?nmR}<7@CbVvNBCl9*XFCQ^OatGVqder+=<*%kIT_^cqeecFrKFeJ0@D&tE= z>n=&5bQf1S*pmB()1H(};NuZZxu|zVN`sg4?f@+He8tb78!6euC3apmN=nPeaj;1W>BtCJCOF8OE@o*Rd57Be`$H1Q6@S$L<47B3TjxL6`REQ; zYRe$}C);4HNkrv(iklDHhfpauloqGCd@8ycgAa~)RKF;_))b;BahS5HO3d^&8E6KT z9JaH_sGSwzVNjoJ`1QNPn!VYBAX*|2CUfiCRneN+v)5HOWYgM*vXL{{jvrNWg)^uU zb_yi3ZVY11lU)(EneV2q_>X*7r?#!U4r>j%yV0kDjcxa*xNj)us}m=J@UOJLsPppl zo|kdbsm9N%bhEAeP%hB+Tg(QER}U?N5LjM6^5IyxrG+4Oe9P z(EUeB!=INi)#EqS^E-y-LTnX&0*BlJ|7^L| z*S4N>7qS!)FR%ak{DMdSnU#8dD~kPGjc)1lwC~kajgTzHpf*BMGDZ)8HnY8a3B?k?5TO8J%ma)P`M);l* zQ`eqSh0?{rueoB!!`H@ey{uX~?w94u+S*WjUOCAEg4dp8SD_LPHVR#69*^7B)|T*+ ze%uBN7vJ5D1CrCurB=cps>~E%N$&nV&nki~@wa1uWa|@xL2wUyZNUvA!gq}hqguS* zZmrh78bW*ZP?`f5NoC0ta7)p(S-C+0duzhbM zncLlFLBOjW@paAz2HKPE-;9lRR*fM{=YRI_{G*DUn;upY+e<@dgb&1J*kA4ZR#eO1 zDS0eUhLbRlC_Bd*?zZQt6FoJE6W0_{&AO-9N8H_EHDh6vOoN9PFsso9l9798a(Ce2 z^e_6SDk!09Xb7{bn~#wi0e8m(CP~27q9;tCZ{={@S9F9hZ-EQh5uyF$1|>*div.list>div.title div.action div.item.button.icons input { display:none $output>div.list>div.item.index { padding:10px; display:flex; flex-direction:column; align-items:center; float:left; } $output>div.list>div.item.index.hide { display:none; } $output>div.list>div.item.index img { width:100%; } +$output>div.list>div.output { max-height:400px; } $output>div.list>div.action { display:flex; justify-content:center; } $output>div.list>div.action div.item { margin-right:5px; } $output>div.list>div.action div.item input[type=button] { color:var(--notice-bg-color); border:none; } @@ -15,10 +16,18 @@ $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:80px; float:left; } $output>div.action div.item.button span { display:none; } $output>fieldset table.content td { box-shadow:none; } +$output div.item span.role { border:var(--box-notice); color:var(--notice-bg-color); padding:0 5px; } +$output div.item span.role.landlord { border-color:var(--box-danger); color:var(--danger-bg-color); } +$output div.item span.role.teacher { border-color:var(--box-danger); color:var(--danger-bg-color); } +body.en $output>fieldset table.content td:first-child { max-width:180px; width:unset;} $output>fieldset table.content tr.uid { display:none; } $output>fieldset table.content tr.order_uid { display:none; } $output>fieldset table.content tr.place_uid { display:none; } $output>fieldset table.content td img { max-width:100%; } $output>fieldset.qrcode table.content td { text-align:center; } $output>fieldset.qrcode div.code { text-align:center; } -$output>fieldset.story { box-shadow:none; } \ No newline at end of file +$output>fieldset.story { box-shadow:none; } +$output>fieldset.story>div.output { background-color:var(--plugin-bg-color); } +$output>fieldset.story>div.output div.item.card {} +$output>fieldset.story>div.output div.item.card>div.output { background-color:var(--output-bg-color); padding:10px; } +$output>fieldset.story>div.output div.item.card>div.output div.output { padding:10px 0; } \ No newline at end of file diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index ab12ed2..f4640d6 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -20,13 +20,12 @@ type Portal struct { field string `data:"time,name,icons,index,order,enable,type,role"` inputs string `name:"inputs" role:"void"` list string `name:"list place_uid index uid auto" role:"void"` - placeCreate string `name:"placeCreate city_name* street_name* place_type*:select name* address*" role:"void" icon:"bi bi-plus-square-dotted"` - placeRemove string `name:"placeRemove uid*" role:"void" style:"danger"` - scanQRCode string `name:"scanQRCode type text" role:"void" icon:"bi bi-qr-code-scan"` + placeCreate string `name:"placeCreate city_name* street_name* place_type*:select name* address*" icon:"bi bi-plus-square-dotted" role:"void"` + placeRemove string `name:"placeRemove uid*" style:"danger" role:"void"` + scanQRCode string `name:"scanQRCode type text" icon:"bi bi-qr-code-scan" role:"void"` } func (s Portal) BeforeMigrate(m *ice.Message, arg ...string) { - } func (s Portal) Inputs(m *ice.Message, arg ...string) { m.Cmdy(s.Place, m.ActionKey(), arg) @@ -43,7 +42,7 @@ func (s Portal) List(m *ice.Message, arg ...string) { }) } else if len(arg) == 2 { msg := m.Cmd(s.Place, s.Select, model.UID, arg[0]) - m.Option(s.Key(s.Place, model.NAME), msg.Append(model.NAME)) + m.Option(s.Keys(s.Place, model.NAME), msg.Append(model.NAME)) m.Cmdy(ctx.COMMAND, arg[1]).Push(ctx.ARGS, arg[0]) } else if len(arg) == 1 { s.Hash.List(m, arg[1:]...).SortInt(mdb.ORDER) diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 2d099d6..64e8c81 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -1,7 +1,8 @@ var UID = "uid", PLACE_UID = "place_uid", PLACE_NAME = "place_name", PLACE_TYPE = "place_type", STREET_NAME = "street_name" Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - can.onimport.myPortal(can, msg, msg.Option("_place_uid")||PLACE_UID, msg.Option("_place_name")||PLACE_NAME, msg.Option("_street_name")) + can.user.isMobile && can.isCmdMode() && can.onappend.style(can, html.OUTPUT) + can.onimport.myPortal(can, msg) }, myValue: function(can, value, PLACE_UID, PLACE_NAME, STREET_NAME) { var PLACE_TYPE = PLACE_NAME.replace("_name", "_type") @@ -12,56 +13,53 @@ Volcanos(chat.ONIMPORT, { value[USER_PLACE_ROLE] != "creator" && {text: [can.user.transValue(can, value, USER_PLACE_ROLE), "", aaa.ROLE]}, ]}, {view: html.STATUS, list: [ - {text: value.city_name}, {text: value[STREET_NAME]}, - // {text: value[PLACE_UID].slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}, + {text: value[PLACE_UID].slice(0, 6)}, {text: value.city_name}, {text: value[STREET_NAME]}, ]}, ] }, - myPortal: function(can, msg, PLACE_UID, PLACE_NAME, STREET_NAME, title) { can.user.isMobile && can.isCmdMode() && can.onappend.style(can, html.OUTPUT) - var PLACE_TYPE = PLACE_NAME.replace("_name", "_type") - can.isCmdMode() && (can.db.hash = can.misc.SearchHash(can)) - can.sup.current = can.sup.current||{} + 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") + can.sup.current = can.sup.current||{}, can.isCmdMode() && (can.db.hash = can.misc.SearchHash(can)) if (can.Option(PLACE_UID) == "") { + msg.Table(function(value) { msg.Push(mdb.ICONS, can.Conf(can.core.Keys("_trans.value", PLACE_TYPE, mdb.ICONS, value[PLACE_TYPE]))||"") }) if (can.db.hash.length > 1 && can.db.hash[0]) { return can.Option(PLACE_UID, can.db.hash[0]), can.Option(ctx.INDEX, can.db.hash[1]), can.Update() } can.db.hash[0] && can.onexport.session(can, PLACE_UID, can.db.hash[0]) can.ui = can.page.Append(can, can._output, ["myplace.list", "myindex.list"]) - can.page.Append(can, can.ui.myplace, [{view: html.TITLE, list: [{text: can.user.trans(can, "My "+can.base.capital(PLACE_NAME.replace("_name", "")), null, html.INPUT)}], _init: function(target) { - can.page.Append(can, target, [{view: html.ACTION, _init: function(target) { - msg.Option(ice.MSG_ACTION) && can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) - }}]) - }}]) - msg.Table(function(value) { var key = "_trans.value."+PLACE_NAME.replace("_name", "_type")+".icons." - msg.Push(mdb.ICONS, can.Conf(key+value[PLACE_TYPE])||can.Conf(key+"office")) - }) + can.page.Append(can, can.ui.myplace, [{view: html.TITLE, list: [ + {text: can.user.trans(can, "My "+can.base.capital(PLACE_NAME.replace("_name", "")), null, html.INPUT)}, + {view: html.ACTION, _init: function(target) { msg.Option(ice.MSG_ACTION) && can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }} + ]}]) var uid = can.onimport.myPlace(can, msg, can.ui.myplace, PLACE_UID, PLACE_NAME, STREET_NAME) msg.Length() > 0 && can.run({}, [uid], function(msg) { can.page.Append(can, can.ui.myindex, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Index", "我的应用")}]}]) - for (var i = 0; i < 1; i++) { can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID) } - can.onimport.selectIndex(can, can.sup.current, PLACE_UID, PLACE_NAME) - }) - can.user.agent.init(can) + can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID), can.onimport.selectIndex(can, msg, can.sup.current, PLACE_UID, PLACE_NAME) + }), can.user.agent.init(can) } else { can.onimport.myData(can, msg, can._output, PLACE_UID, PLACE_NAME) } }, myPlace: function(can, msg, target, PLACE_UID, PLACE_NAME, STREET_NAME) { var place_uid - can.page.Append(can, target||can._output, msg.Table(function(value) { + 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") + var _target = can.page.Append(can, target||can._output, [html.OUTPUT])._target + can.page.Append(can, _target, msg.Table(function(value) { place_uid = place_uid||value[PLACE_UID], can.base.isIn(value[PLACE_UID], can.onexport.session(can, PLACE_UID)||"", can.db.hash[0]||"") && (place_uid = value[PLACE_UID]) place_uid == value[PLACE_UID] && (can.onexport.title(can, value[PLACE_NAME]), can.sup.current = value) - value._uid = value[PLACE_UID] + value._uid = value[PLACE_UID], value._name = value[PLACE_NAME], value._type = value[PLACE_TYPE], value._role = value[USER_PLACE_ROLE] return can.onimport.itemcard(can, value, can.onimport.myValue(can, value, PLACE_UID, PLACE_NAME, STREET_NAME), function(event) { - can.sup.current = value, can.onimport.selectIndex(can, can.sup.current) + can.sup.current = value, can.onimport.selectIndex(can, msg, can.sup.current, PLACE_UID, PLACE_NAME) can.onexport.hash(can, value[PLACE_UID]), can.onexport.session(can, PLACE_UID, value[PLACE_UID]), can.onexport.title(can, value[PLACE_NAME]) can.user.agent.init(can, can.user.info.titles) }) })) - can.page.Select(can, target, "div.item.card.uid-"+place_uid, function(_target) { can.onmotion.select(can, target, html.DIV_ITEM, _target) }) + can.page.Select(can, _target, "div.item.card.uid-"+place_uid, function(item) { can.onmotion.select(can, _target, html.DIV_ITEM, item) }) can.page.Append(can, target, [{view: html.ACTION, _init: function(target) { msg.Option(ice.MSG_ACTION) && can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }}]) can.onexport.hash(can, place_uid), can.onexport.session(can, PLACE_UID, place_uid); return place_uid }, - selectIndex: function(can, value, PLACE_UID, PLACE_NAME) { - var PLACE_TYPE = PLACE_NAME.replace("_name", "_type") - var USER_PLACE_ROLE = "user_"+PLACE_NAME.replace("_name", "_role") + selectIndex: function(can, msg, value, PLACE_UID, PLACE_NAME) { + 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") can.page.Select(can, can.ui.myindex, html.DIV_ITEM, function(target) { var list = target.className.split(" ") if (list.indexOf(mdb.TYPE) > -1 && list.indexOf(value[PLACE_TYPE]) == -1) { @@ -75,13 +73,10 @@ Volcanos(chat.ONIMPORT, { }, myIndex: function(can, msg, target, PLACE_UID) { var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/100), height = width+20; can.user.isMobile && !can.user.isLandscape() && (width = (can.ConfWidth()-40)/4, height = width+20) - can.page.Append(can, target||can._output, msg.Table(function(value) { - if (value.enable != ice.TRUE) { - return - } + can.page.Append(can, target||can._output, msg.Table(function(value) { if (value.enable != ice.TRUE) { return } return {view: [[html.ITEM, ctx.INDEX].concat( - value.type? ["type"]: [], can.core.Split(value.type||""), - value.role? ["role"]: [], can.core.Split(value.role||""), + value.type? [mdb.TYPE]: [], can.core.Split(value.type||""), + value.role? [aaa.ROLE]: [], can.core.Split(value.role||""), )], style: {height: height, width: width}, list: [ {img: can.misc.ResourceIcons(can, value.icons)}, {text: can.user.trans(can, value.index.split(".").pop(), value.name)}, ], onclick: function(event) { @@ -95,14 +90,22 @@ Volcanos(chat.ONIMPORT, { var ui = can.page.Append(can, can._output, [{view: html.ACTION}]) if (can.db.hash.length > 2 && can.db.hash[0] && can.db.hash[2]) { value.args = [can.db.hash[0], can.db.hash[2]] } value.style = html.OUTPUT, value.height = can.ConfHeight()-html.ACTION_HEIGHT - // can.onexport.title(can, value.help, can.user.trans(can, msg.Option("place_type"), null, "value.place_type"), msg.Option("place_name")) can.onexport.title(can, value.help, msg.Option(PLACE_NAME)) can.onappend.plugin(can, value, function(sub) { refresh = function() { sub.Update() } + can.core.List(["_trans", "_trans.input", "_trans.value", "_icons", "_style"], function(key) { + var value = sub.Conf(key); value && can.core.Item(can.Conf(key), function(k, v) { value[k] = value[k]||v }) + }) sub.Conf(PLACE_NAME, msg.Option(PLACE_NAME)) + sub.onexport.title = function(sub) { can.onexport.title.apply(can.onexport, [can].concat(can.core.List(arguments).slice(1))) } + sub.onexport._output = function(_sub, msg) { + can.core.Item(can.onimport, function(key, value) { _sub.onimport[key] = _sub.onimport[key]||value }) + can.core.Item(can.onexport, function(key, value) { _sub.onexport[key] = _sub.onexport[key]||value }) + } sub.onexport.output = function(_sub, msg) { can.onappend.style(sub, html.OUTPUT) can.page.Appends(can, ui.action, list), msg.Option(ice.MSG_ACTION) && can.onappend._action(sub, msg.Option(ice.MSG_ACTION), ui.action, null, true) can.onexport.hash(can, can.Option(PLACE_UID), value.index, sub.Option(UID)) - can.user.agent.init(can, msg.Option("_share_content")||value.help, msg.Option("_share_icons")||value.icons) + can.onexport.title(can, sub.ConfHelp(), sub.Conf(PLACE_NAME), msg.Option("_share_title")||"") + can.user.agent.init(can, msg.Option("_share_content"), msg.Option("_share_icons")||value.icons) back = function() { if (sub.Option(UID)) { can.onexport.hash(can, can.Option(PLACE_UID), can.Option(ctx.INDEX)), sub.Option(UID, ""), sub.Update() @@ -115,3 +118,9 @@ Volcanos(chat.ONIMPORT, { }) }, }) +Volcanos(chat.ONEXPORT, { + 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/portal.json b/src/gonganxitong/portal.json index 553e7f1..f195001 100644 --- a/src/gonganxitong/portal.json +++ b/src/gonganxitong/portal.json @@ -65,16 +65,16 @@ "visitor": "访客" }, "apply_status": { - "create": "待提交 🕑", - "cancel": "已取消 ❌", - "submit": "已提交 🕑", - "rejected": "已驳回 ❌", - "approved": "已通过 ✅" + "create": "待提交", + "cancel": "已取消", + "submit": "已提交", + "rejected": "已驳回", + "approved": "已通过" }, "order_status": { - "create": "待审批 🕑", - "rejected": "已驳回 ❌", - "approved": "已通过 ✅" + "create": "待审批", + "rejected": "已驳回", + "approved": "已通过" } } } diff --git a/src/gonganxitong/sess.go b/src/gonganxitong/sess.go index df791bd..a142ff9 100644 --- a/src/gonganxitong/sess.go +++ b/src/gonganxitong/sess.go @@ -12,7 +12,7 @@ import ( type sess struct { Table user user - create string `name:"create user_uid"` + create string `name:"create user_uid*"` } func (s sess) Create(m *ice.Message, arg ...string) { diff --git a/src/gonganxitong/user.go b/src/gonganxitong/user.go index 97fbfa2..4694b72 100644 --- a/src/gonganxitong/user.go +++ b/src/gonganxitong/user.go @@ -38,7 +38,3 @@ func (s user) SendTemplate(m *ice.Message, arg ...string) { // from uid url type } func init() { ice.TeamCtxCmd(user{}) } - -type User struct{ user } - -func init() { ice.TeamCtxCmd(User{}) } diff --git a/src/gonganxitong/userPlace.go b/src/gonganxitong/userPlace.go index b379c4f..afbe42b 100644 --- a/src/gonganxitong/userPlace.go +++ b/src/gonganxitong/userPlace.go @@ -22,17 +22,13 @@ func (s userPlace) List(m *ice.Message, arg ...string) { if len(arg) == 1 { s.Select(m, model.USER_UID, arg[0]) } else if len(arg) == 2 { - s.Select(m.FieldsSetDetail(), model.USER_UID, arg[0], model.PLACE_UID, arg[1]) + s.SelectDetail(m, model.USER_UID, arg[0], model.PLACE_UID, arg[1]) } s.RewriteAppend(m) } func init() { ice.TeamCtxCmd(userPlace{}) } -type UserPlace struct{ userPlace } - -func init() { ice.TeamCtxCmd(UserPlace{}) } - type UserPlaceRole int const ( diff --git a/usr/local/export/web.team.gonganxitong.portal/hash.json b/usr/local/export/web.team.gonganxitong.portal/hash.json index 9e1e668..f475134 100644 --- a/usr/local/export/web.team.gonganxitong.portal/hash.json +++ b/usr/local/export/web.team.gonganxitong.portal/hash.json @@ -6,7 +6,7 @@ "index": "web.team.gonganxitong.apply", "name": "权限申请", "order": "3", - "time": "2024-08-04 10:59:49.031" + "time": "2024-08-04 20:40:00.961" } }, "58724bdcc3cae3e26700cb3199e0602c": { @@ -17,7 +17,7 @@ "name": "场所用户", "order": "5", "role": "creator,landlord", - "time": "2024-08-04 10:21:38.110" + "time": "2024-08-04 20:31:58.911" } }, "91dd0e9590d3021944f14f3ec8653beb": { @@ -28,7 +28,7 @@ "name": "权限审批", "order": "4", "role": "creator,landlord", - "time": "2024-08-04 10:18:03.398" + "time": "2024-08-04 21:29:49.710" } }, "ad574b9493741774ef8cb3fd5efd8026": { @@ -49,7 +49,7 @@ "name": "事件流", "order": "2", "role": "creator,landlord", - "time": "2024-08-04 11:53:34.283" + "time": "2024-08-04 20:45:03.518" } }, "e2117b53c036a72fe7e4885449488a6f": { @@ -59,7 +59,7 @@ "index": "web.team.gonganxitong.qrcode", "name": "场所码", "order": "1", - "time": "2024-08-04 09:47:55.478" + "time": "2024-08-04 21:19:42.289" } }, "fd86aad80a667152781bb188fb1249a2": { @@ -69,7 +69,7 @@ "index": "web.team.gonganxitong.email", "name": "邮箱配置", "role": "creator", - "time": "2024-08-04 10:57:25.060" + "time": "2024-08-04 19:51:30.768" } } }