From 52b54c6af7b43594a99c45d79c71220fbad62302 Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 4 Oct 2024 18:43:10 +0800 Subject: [PATCH] add some --- src/gonganxitong/common.go | 5 ++++- src/gonganxitong/portal.css | 13 +++++++++---- src/gonganxitong/portal.go | 10 +++++++--- src/gonganxitong/portal.js | 27 ++++++++++++++++++++------- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 3a512ca..d6810b5 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -135,10 +135,13 @@ func (s Table) ValueList(m *ice.Message, arg []string, fields ...ice.Any) *ice.M } if s.ValueModel(m, s.ValueList, arg...); len(arg) == 1 { s.UserPlaceInit(m) + if m.Length() == 0 { + m.Echo("没有数据") + } if s.IsLeader(m) { s.Button(m, "") } else { - m.Echo("没有数据").Action() + m.Action() } } return s.SelectJoinUser(m) diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index e1c0de0..ed68959 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -1,5 +1,6 @@ body.dark { --plugin-bg-color:#0d1117; --output-bg-color:#171a22; } body.mobile.light { --plugin-bg-color:#f4f5f9; --output-bg-color:#fefefd; } +body.mobile.light { --plugin-bg-color:#f4f5f9; --output-bg-color:white; } body.mobile fieldset.Action div.input.float { position:static; } body.mobile fieldset.Action div.input.float table { width:100%; } body.mobile div.upload.float div.action { display:flex; } @@ -13,13 +14,17 @@ $action div.item.button span { display:none; } $action div.item.button i { display:none; } $output div.title div.action div.item.notice input { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } $output { background-color:var(--plugin-bg-color); } -$output>div.header { border-radius:100px; background-color:var(--notice-bg-color); height:300px; width:100%; position:absolute; top:-50px; left:0; } -$output>div.header img { height:100%; width:100%; } +$output>div.header { + // border-radius:100px; background-color:var(--notice-bg-color); + background-image:linear-gradient(var(--notice-bg-color), var(--plugin-bg-color)); +height:300px; width:100%; position:absolute; top:-50px; left:0; } +$output>div.header img { height:100%; width:100%; object-fit:cover; } $output>div.footer { border-radius:100px; background-color:var(--notice-bg-color); height:300px; width:100%; position:absolute; bottom:-100px; left:0; } +$output>div.action>div.list { margin:0 10px; } $output>div>div.code { margin-bottom:240px; display:flex; flex-direction:column; align-items:center; } $output>div>div.list { border-radius:10px; background-color:var(--output-bg-color); padding:10px; margin:10px; } $output>div>div.list.myplace>div.output { padding:0 10px; max-height:420px; } -$output>div>div.list.mycount { min-height:105px; } +// $output>div>div.list.mycount { min-height:105px; } $output>div>div.list.mynotice { cursor:pointer; } $output>div>div.list.mynotice:not(.hide) { display:flex; align-items:center; } $output>div>div.list.mynotice>span.title { flex-grow:1; margin:0 5px; } @@ -42,7 +47,7 @@ $output>div>div.list>div.role span.teacher.select { border-bottom:var(--box-dang $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 img { height:36px; width:36px; 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; } diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index 1069f8a..e9915fc 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -25,7 +25,7 @@ type Portal struct { service service export string `data:"true"` short string `data:"index"` - field string `data:"time,icons,name,index,order,enable,init,type,role,view"` + field string `data:"time,icons,name,index,order,enable,init,type,role,view,public"` create string `name:"create index name icons"` list string `name:"list place_uid index uid auto" role:"void"` placeCreate string `name:"placeCreate city_name* street_name* place_name* place_type:select address" icon:"bi bi-plus-square-dotted" role:"void"` @@ -207,8 +207,8 @@ func (s Portal) PlaceAuth(m *ice.Message, arg ...string) { ) m.Cmd(s.Place, s.UpdateField, m.OptionSimple(model.AUTH_UID), model.UID, msg.Append(model.UID)) s.RecordEventWithName(m.Options(msg.AppendSimple(model.NAME, model.UID)), "") + msg.Append(model.AUTH_UID, m.Option(model.AUTH_UID)) msg.Cmd(s.Prefix(msg, s), s.AfterPlaceAuth) - s.StorageCreate(m, "") } func (s Portal) ValueCreate(m *ice.Message, arg ...string) { @@ -263,10 +263,14 @@ func (s Portal) MarketInsert(m *ice.Message, arg ...string) { m.Cmdy(s.Prefix(m, market{}), s.Create, arg) } func (s Portal) DashboardCreate(m *ice.Message, name string, arg ...string) func() { + m.Info("what %v", m.FormatChain()) + m.Info("what %v", m.Option(model.AUTH_UID)) defer s.SaveBack(m, ice.MSG_USERPOD)() kit.If(name == "", func() { name = m.Option(s.Keys(s.Place, model.NAME)) }) s.AutoCmdy(m, api.DASHBOARD_PORTAL, s.PlaceCreate, m.OptionSimple(model.CITY_NAME, model.COMPANY_NAME), model.DASHBOARD_NAME, name, model.DASHBOARD_TYPE, "0") - s.AutoCmd(m, api.RENZHENGSHOUQUAN_AUTH, s.UpdateField, m.OptionSimple(model.DASHBOARD_UID)) + m.Info("what %v", m.Option(model.AUTH_UID)) + m.Info("what %v", m.FormatChain()) + s.AutoCmd(m, api.RENZHENGSHOUQUAN_AUTH, s.UpdateField, m.OptionSimple(model.DASHBOARD_UID), model.UID, m.Option(model.AUTH_UID)) return func() { s.DashboardUpdate(m) } } func (s Portal) DashboardInsert(m *ice.Message, score int, title, unit string, index ice.Any, field string, arg ...ice.Any) { diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 14cddcf..2208306 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -34,13 +34,14 @@ Volcanos(chat.ONIMPORT, { }) }) } can.ui = can.page.Append(can, can._output, [{view: html.HEADER}, - {view: html.OUTPUT, list: ["myplace.list", "myinit.list", "mycount.list", "mynotice.list", "myindex.list", "myallow.list"]}, + {view: html.OUTPUT, list: ["myplace.list", "myinit.list", "mycount.list", "mynotice.list", "myindex.list", "myallow.list", "mylist.list"]}, {view: html.ACTION, list: ["myorder.list"]}, ]) can.onmotion.hidden(can, can.ui.myinit) can.onmotion.hidden(can, can.ui.mycount) can.onmotion.hidden(can, can.ui.mynotice) can.onmotion.hidden(can, can.ui.myallow) + can.onmotion.hidden(can, can.ui.mylist) function showIndex(msg) { if (msg.Length() == 0) { return } can.onimport.myCount(can, msg, can.ui.mycount) can.onimport.myNotice(can, msg, can.ui.mynotice) @@ -53,8 +54,7 @@ Volcanos(chat.ONIMPORT, { } else { can.onappend.style(can, "public", can._output) var _msg = can.request({}); if (msg.Option(PLACE_NAME)) { _msg.Push(kit.Dict(UID, "", msg.OptionSimple( PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME, - "member_status", - "auth_status", "auth_name", "auth_info", "auth_avatar", "auth_background", "dashboard_uid", + "member_status", "auth_status", "auth_name", "auth_info", "auth_avatar", "auth_background", "dashboard_uid", ))) } can.onimport.myPlace(can, _msg, can.ui.myplace) if (_msg.Length() == 0) { can.onimport.myOrder(can, msg, can.ui.myorder) } else { showIndex(can._index_msg = msg) } can.onappend.board(can, msg, can.ui.output), can.onexport.value(can, can.sup.current) @@ -109,6 +109,17 @@ Volcanos(chat.ONIMPORT, { 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 } + if (value.public && can.page.tagis(can._output, "div.output.public")) { can.onimport.myTitle(can, value.index, value.name, can.ui.mylist) + can.onmotion.toggle(can, can.ui.mylist, true) + can.onappend.plugin(can, {index: value.index, args: [can.sup.current._uid]}, function(sub) { + sub.onexport.output = function(_sub, msg) { + _sub.onaction.carddetail = function(event, _sub, value) { + can.onimport.myStory(can, {index: sub.ConfIndex(), args: [can.sup.current._uid, value.uid]}) + return true + } + } + }, can.ui.mylist) + } 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: [ @@ -122,7 +133,8 @@ Volcanos(chat.ONIMPORT, { 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) { can.onimport.myTitle(can, "My Index", "我的应用", target) + myIndex: function(can, msg, target) { + can.onimport.myTitle(can, "My Index", "我的应用", target) var list = ["visitor", "creator", "landlord", "teacher", "leader", "boss", "tenant", "student", "worker", "custom", "admin", "parent", "server"] var _list = can.Conf("_trans.value."+can.Conf("_user_place_role")) can.core.Item(_list, function(key) { list.indexOf(key) == -1 && list.push(key) }) @@ -155,12 +167,10 @@ Volcanos(chat.ONACTION, { can.user.isMobile && can.page.style(can, can._root.Action._output, html.VISIBILITY, html.HIDDEN) sub.Option("city_name", "深圳市") // sub.Option("city_name", "邹城市") - sub.Option("street_name", "航城街道") sub.Option("school_name", "深圳中学") sub.Option("company_name", "云境互联") // sub.Option("company_name", "老邵木器加工") - sub.Option("place_name", "易尚三维") sub.Option("queue_name", "二楼产检") sub.Option("group_name", "爬山群") @@ -169,12 +179,15 @@ Volcanos(chat.ONACTION, { sub.Option("store_name", "老邵木器加工") sub.Option("capital_name", "国资委") sub.Option("channel_name", "公众号") + sub.Option("cloud_name", "系统云") + sub.Option("repos_name", "ContextOS") + sub.Option("story_name", "ContextOS") sub.Option("reception_name", "科室1") sub.Option("volume_amount", "100") sub.Option("grade", "2024级") }, - afterInputs: function(event, can, button, target) { + afterInputs: function(event, can, button, sub) { can.user.isMobile && can.page.style(can, can._root.Action._output, html.VISIBILITY, "") }, })