diff --git a/src/gonganxitong/allow.css b/src/gonganxitong/allow.css index 669bbc3..a8a1088 100644 --- a/src/gonganxitong/allow.css +++ b/src/gonganxitong/allow.css @@ -1,2 +1,2 @@ body.width1 $output div.item.card div.title span.role { margin-left:auto; } -body.width1 $output div.item.card div.title div.action { top:24px; } \ No newline at end of file +// body.width1 $output div.item.card div.title div.action { top:24px; } \ No newline at end of file diff --git a/src/gonganxitong/allow.js b/src/gonganxitong/allow.js index 3bfde0f..2069a7b 100644 --- a/src/gonganxitong/allow.js +++ b/src/gonganxitong/allow.js @@ -1,8 +1,9 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { var USER_PLACE_ROLE = msg.Option("_user_place_role") can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, USER_PLACE_ROLE), can.onimport.titleAction(can, value)]}, + {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, USER_PLACE_ROLE)]}, {view: html.STATUS, list: [can.onimport.uidView(can, value), can.onimport.timeView(can, value), can.onimport.textView(can, value)]}, + can.onimport.titleAction(can, value), ] }) }, }) diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 02ad0a8..1537964 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -208,6 +208,9 @@ func (s Table) Remove(m *ice.Message, arg ...string) { s.ValueRemove( func (s Table) List(m *ice.Message, arg ...string) *ice.Message { return s.ValueList(m, arg) } func (s Table) RewriteAppend(m *ice.Message, arg ...string) *ice.Message { m.RewriteAppend(func(value, key string, index int) string { + if kit.HasPrefix(value, "https://meeting.tencent.com/cw/", "https://meeting.tencent.com/crm/", "https://www.bilibili.com/video/") { + return kit.Format("", value) + } if value != "" && kit.IsIn(key, model.BACKGROUND, model.AVATAR) { value = m.Resource(value) } diff --git a/src/gonganxitong/member.js b/src/gonganxitong/member.js index c634131..c88f664 100644 --- a/src/gonganxitong/member.js +++ b/src/gonganxitong/member.js @@ -4,8 +4,9 @@ Volcanos(chat.ONIMPORT, { can.onimport.myViewTabs(can, USER_PLACE_ROLE, msg, function(value) { value._style = [value[USER_PLACE_ROLE], value.member_status, value.who,] return [ - {view: html.TITLE, list: [value.user_name, - can.onimport.authView(can, value), can.onimport.unitView(can, value, "score", "星"), + {view: html.TITLE, list: [value.user_name, can.onimport.authView(can, value), + can.onimport.spaceView(can, value), + can.onimport.unitView(can, value, "score", "星"), can.onimport.textView(can, value, USER_PLACE_ROLE), value.member_status != "normal" && can.onimport.textView(can, value, "member_status"), ]}, diff --git a/src/gonganxitong/notice.js b/src/gonganxitong/notice.js index 0dcac5b..0ff126f 100644 --- a/src/gonganxitong/notice.js +++ b/src/gonganxitong/notice.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.title, can.onimport.titleAction(can, value)]}, can.onimport.metaView(can, value), - {view: html.OUTPUT, list: [value.content]}, + can.onimport.contentView(can, value), ] }) }, }) \ No newline at end of file diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index 4c74e5e..daddb3d 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -8,7 +8,7 @@ $action div.item input[type=button] { background-color:transparent; color:var(-- $action div.item.danger input[type=button] { color:var(--danger-bg-color); } $action div.item.button i { display:none; } $action div.item.button span { display:none; } -$action div.item.button input { border:none; min-width:60px; display:unset; } +$action div.item.button input { border:none; min-width:40px; display:unset; } $action div.item.text.filter:last-child { margin-right:10px; } $action div.item.text.filter i { padding-left:10px; } $action div.item.text.filter span { right:5px; } @@ -92,6 +92,7 @@ $output div.item.card img:not(:last-child) { margin-right:10px; } $output div.item.card img:last-child { margin-left:10px; } $output div.item.card div.container img { margin-right:0; height:100%; width:100%; } $output div.item.card div.container>div.action { position:relative; float:right; } +// $output div.item.card div.status { font-family:monospace; } body:not(.width1) $output div.item.card div.title>div.action { display:none; } body.width1 $output div.item.card>div.output>div { width:100%; width:calc(100% - 53px); overflow:hidden; } $output div.item.card.sticky>div.output { background-color:var(--plugin-bg-color); color:var(--notice-bg-color); } @@ -140,19 +141,30 @@ $output div.item.title.meetList { border-left:var(--box-danger3); } $output div.item.title.dealList { border-left:var(--box-danger3); } $output div.item.title div.action div.item.notice input { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } $output fieldset.story>div.output { background-color:var(--plugin-bg-color); } -$output fieldset.story>div.output>div.tabs { background-color:var(--plugin-bg-color); display:flex; overflow:auto; position:sticky; top:0; z-index:2; } -$output fieldset.story>div.output>div.tabs.wrap { border-bottom: var(--box-border); height:unset; max-height:320px; flex-direction:column; } +$output fieldset.story>div.output>div.tabs { flex-direction:column; height:unset; } +$output fieldset.story>div.output>div.tabs { line-height:32px; background-color:var(--plugin-bg-color); display:flex; overflow:auto; position:sticky; top:0; z-index:2; } +$output fieldset.story>div.output>div.tabs div.tabs { height:32px; } +$output fieldset.story>div.output>div.tabs.wrap { height:unset; max-height:320px; flex-direction:column; } +$output fieldset.story>div.output>div.tabs.wrap div.tabs { border-bottom:var(--box-border); height:unset; flex-direction:column; } +$output fieldset.story>div.output>div.tabs div.item { white-space:pre; line-height:22px; padding:5px 10px; } +$output fieldset.story>div.output>div.tabs div.item:not(.select) { color:var(--label-fg-color); } +$output fieldset.story>div.output>div.tabs div.item.all { position:sticky; left:0; top:0; z-index:1; } +$output fieldset.story>div.output>div.tabs div.item.select { border-top:var(--box-notice); background-color:var(--output-bg-color); } +$output fieldset.story>div.output>div.tabs.wrap div.item.select { + border-top:none !important; + border-left: var(--box-notice); + background-color:var(--output-bg-color); +} +$output fieldset.story>div.output>div.tabs.wrap div.item.danger.select { + border-left: var(--box-danger); +} +$output fieldset.story>div.output>div.tabs div.item.select:not(.all) { position:sticky; } +$output fieldset.story>div.output>div.tabs div.item.danger.select { border-top:var(--box-danger); background-color:var(--output-bg-color); } $output fieldset.story>div.output>div.tabs div.item.wrap { text-align:center; padding:5px 10px; position:sticky; right:0; bottom:0; } $output fieldset.story>div.output>div.tabs div.item.wrap:not(:hover) { color:var(--notice-bg-color) !important; } +body.mobile $output fieldset.story>div.output>div.tabs div.item.select { font-weight:bold; } +body:not(.mobile) $output fieldset.story>div.output>div.tabs div.item.all:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } body:not(.mobile) $output fieldset.story>div.output>div.tabs div.item.wrap:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } -$output fieldset.story>div.output>div.tabs>div.item { white-space:pre; line-height:22px; padding:5px 10px; } -$output fieldset.story>div.output>div.tabs>div.item:not(.select) { color:var(--label-fg-color); } -$output fieldset.story>div.output>div.tabs>div.item.all { position:sticky; left:0; top:0; z-index:1; } -body:not(.mobile) $output fieldset.story>div.output>div.tabs>div.item.all:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } -$output fieldset.story>div.output>div.tabs>div.item.select { border-top:var(--box-notice); background-color:var(--output-bg-color); } -body.mobile $output fieldset.story>div.output>div.tabs>div.item.select { font-weight:bold; } -$output fieldset.story>div.output>div.tabs>div.item.select:not(.all) { position:sticky; } -$output fieldset.story>div.output>div.tabs>div.item.danger.select { border-top:var(--box-danger); background-color:var(--output-bg-color); } $output fieldset.story.otherList>div.output>div.todo { display:none; } $output fieldset.story>div.output>div.todo { padding:5px 10px 20px; } $output fieldset.story>div.output>div.todo>div.item { display:flex; align-items:center; justify-content:center; flex-grow:1; } diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 4ec8765..c9f5330 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -185,8 +185,10 @@ Volcanos(chat.ONIMPORT, { can.onmotion.delay(can, function() { can.onimport.layout(can) }, 300) }, layout: function(can) { - can.ui.tabs && can.ui.list && can.page.styleHeight(can, can.ui.list, can.ConfHeight()-can.ui.tabs.offsetHeight) - can.ui.tabs && can.ui.list && can.ui.todo && can.page.styleHeight(can, can.ui.list, can.ConfHeight()-can.ui.tabs.offsetHeight-can.ui.todo.offsetHeight) + var height = can.ConfHeight() + can.ui.tabs && (height -= can.ui.tabs.offsetHeight) + can.ui.todo && (height -= can.ui.todo.offsetHeight) + can.ui.list && can.page.styleHeight(can, can.ui.list, height) if (can.ui.action && can.ui.output) { can.page.style(can, can.ui.output, html.HEIGHT, (can.ConfHeight()) - can.ui.action.offsetHeight) } if (can._stacks_current && can.sup == can._stacks_current[0]) { can.core.List(can._stacks_current.slice(1), function(p) { diff --git a/src/renzhengshouquan/profile.css b/src/renzhengshouquan/profile.css index 6f6c4f1..fa689f6 100644 --- a/src/renzhengshouquan/profile.css +++ b/src/renzhengshouquan/profile.css @@ -1,5 +1,6 @@ -$output>div>div.title { border-left:var(--box-notice3); padding:10px; margin-left:10px; } +$output>div>div.title { border-left:var(--box-notice3); padding-left:10px; margin:10px; } $output>div.from>div.title { border-left:var(--box-danger3); } -body.width1 $output div.item.card div.title span.type { margin-left:auto; } -$output div.item.card div.title div.action { top:16px; } -$output>div.head { margin-bottom:0; } \ No newline at end of file +$output>div.head { margin-bottom:0; } +$output>div.list { height:unset !important; } +$output div.item.card div.title span.type { margin-left:auto; } +$output div.item.card div.title div.action { top:16px; } \ No newline at end of file diff --git a/src/renzhengshouquan/profile.js b/src/renzhengshouquan/profile.js index 525a634..efbc151 100644 --- a/src/renzhengshouquan/profile.js +++ b/src/renzhengshouquan/profile.js @@ -5,7 +5,9 @@ Volcanos(chat.ONIMPORT, { can.onaction.updateBackground && can.onaction.updateBackground(event, can) }}]) can.page.Append(can, can.ui.head, [can.onimport.itemcard(can, value, [ - {view: html.TITLE, list: [value.name, can.onimport.authView(can, value), can.onimport.textView(can, value, AUTH_TYPE), can.onimport.titleAction(can, value)]}, + {view: html.TITLE, list: [value.name, can.onimport.authView(can, value), + can.onimport.textView(can, value, AUTH_TYPE), can.onimport.titleAction(can, value), + ]}, {view: html.STATUS, list: [value.city_name, value.street_name, value.service_name]}, {view: html.STATUS, list: [value.info]}, ], function() {})])