From 852142316bfdab2d60b8d567603c342dd5a71fd8 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 9 Nov 2024 11:35:27 +0800 Subject: [PATCH] add some --- src/gonganxitong/common.js | 5 ++++- src/gonganxitong/market.go | 1 + src/gonganxitong/market.js | 6 +++++- src/gonganxitong/portal.css | 15 +++++++++------ src/gonganxitong/portal.js | 20 ++++++++++++-------- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/gonganxitong/common.js b/src/gonganxitong/common.js index 517e6fa..60e0458 100644 --- a/src/gonganxitong/common.js +++ b/src/gonganxitong/common.js @@ -3,7 +3,10 @@ Volcanos(chat.ONIMPORT, { var PLACE_NAME = msg.Option("_place_name"), PLACE_TYPE = msg.Option("_place_type"), USER_PLACE_ROLE = msg.Option("_user_place_role") PLACE_TYPE || can.core.List(msg.append, function(key) { can.base.endWith(key, "_type") && (PLACE_TYPE = key), can.base.endWith(key, "_role") && (USER_PLACE_ROLE = key) }) can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list:[value.title||value.name||value.user_name, can.onimport.textView(can, value, PLACE_TYPE), can.onimport.textView(can, value, USER_PLACE_ROLE)]}, + {view: html.TITLE, list:[ + value.title||value.name||value.user_name, can.onimport.textView(can, value, PLACE_TYPE), can.onimport.textView(can, value, USER_PLACE_ROLE), + can.onimport.titleAction(can, value), + ]}, {view: html.STATUS, list: [value.city_name, value.company_name||value.street_name, value.place_name]}, {view: html.STATUS, list: [value.uid && value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, value.address && {view: html.STATUS, list: [value.address]}, diff --git a/src/gonganxitong/market.go b/src/gonganxitong/market.go index fda135e..e374aa3 100644 --- a/src/gonganxitong/market.go +++ b/src/gonganxitong/market.go @@ -32,6 +32,7 @@ func (s market) List(m *ice.Message, arg ...string) { s.Key(s, model.USER_UID), model.PLACE_UID, model.SERVICE_NAME, model.TITLE, model.CONTENT, model.THUMB_COUNT, model.COMMENT_COUNT, model.FAVOR_COUNT, model.SHARE_COUNT, model.THUMB_STATUS, model.FAVOR_STATUS, s.AS(model.NODENAME, model.SPACE), s.Key(s.command, model.INDEX), model.ARGS, + model.COMMAND_NAME, ) if len(arg) < 2 { if m.Option(model.DOMAIN_UID) != "" { diff --git a/src/gonganxitong/market.js b/src/gonganxitong/market.js index 33f6bd5..20da3c7 100644 --- a/src/gonganxitong/market.js +++ b/src/gonganxitong/market.js @@ -17,7 +17,11 @@ Volcanos(chat.ONIMPORT, { {text: [value.user_name, "", aaa.USERNAME]}, can.onimport.authView(can, value), can.onimport.timeView(can, value), ]}, {view: html.STATUS, list: [ - {text: [value.street_name, "", "street"]}, {text: [value.place_name, "", "place"]}, {text: [value.service_name.split(" ")[0], "", "service"]}, + // {text: [value.city_name, "", "city"]}, + {text: [value.street_name, "", "street"]}, + {text: [value.place_name, "", "place"]}, + {text: [value.command_name, "", "command"]}, + // {text: [value.service_name.split(" ")[0], "", "service"]}, ]}, {view: html.OUTPUT, list: [value.title]}, {view: html.OUTPUT, list: [value.content]}, diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index d129a50..fa7c3e1 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -65,7 +65,7 @@ body:not(.width1) $output div.item.card { flex-direction:row-reverse; } body:not(.width1) $output div.item.card>div.action { position:static; flex-shrink:0; } body:not(.width1) $output div.item.card>div.output { flex-grow:1; } $output div.item.card>div.output>div { width:100%; } -$output div.item.card div.title { width:100%; display:flex; align-items:center; position:relative; } +$output div.item.card div.title { margin-bottom:5px; width:100%; display:flex; align-items:center; position:relative; } $output div.item.card div.title span:first-child { word-break:break-all; } $output div.item.card div.title span.auth { font-size:14px; } $output div.item.card div.title span.time { position:absolute; right:0; font-size:12px; color:gray; } @@ -75,8 +75,8 @@ $output div.item.card img { border-radius:5px; padding:0; margin:0; margin-right $output div.item.card.sticky>div.output { background-color:var(--plugin-bg-color); color:var(--notice-bg-color); } $action div.item.notice input[type=button] { border:var(--box-notice); color:var(--notice-bg-color); } $action div.item.danger input[type=button] { border:var(--box-danger); color:var(--danger-bg-color); } -$output input.notice[type=button] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } -$output input.danger[type=button] { color:var(--danger-bg-color); } +$output input.notice[type=button]:not(:hover) { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } +$output input.danger[type=button]:not(:hover) { color:var(--danger-bg-color); } $output input[type=button][name=submit] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } $output span.type { border:none; border-radius:5px; background-color:var(--hover-bg-color); color:var(--notice-bg-color); padding:2px 8px; } $output span.role { border:none; border-radius:5px; background-color:var(--hover-bg-color); color:var(--notice-bg-color); padding:2px 8px; } @@ -87,7 +87,8 @@ $output span.status.danger { color:var(--danger-bg-color); } $output table.content { background-color:var(--output-bg-color); } $output table.content td.action input.icons { display:unset; } $output table.content td.action i { display:none; } -$output table.content.detail td.action input { padding:0 20px; min-width:80px; } +$output table.content.detail td.action input { padding:0 10px; min-width:60px; } +// $output table.content.detail td.action input { padding:0 20px; min-width:80px; } $output table.content.detail tr.action input.icons { display:unset; } $output table.content.detail tr.action i { display:none; } $output table.content.detail tr.uid { display:none; } @@ -123,7 +124,7 @@ $output>fieldset.qrcode table.content td { 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 img { border-radius:50%; height:40px; width:40px; min-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; } $output>fieldset.market>div.output>div.list div.item.card div.status>span.time { float:right; } @@ -132,7 +133,7 @@ $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.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.background>div.output { padding-top:120px; } -$output.public>div>div.list>div.title { display:none; } +$output.public>div>div.list:not(.mylist)>div.title { display:none; } $output.public>div>div.list.myplace>div.output { padding:0; } $output.public>div>div.list.myplace div.item.card div.output { padding:0; } fieldset.web.team.storage.file div.item.card div.title span:first-child { flex-grow:1; } @@ -146,3 +147,5 @@ body:not(.mobile) $output>fieldset.story>div.output div.item.card:not(:hover) { body:not(.width1) $output div.item.card div.title div.action { display:none; } body.en $output>fieldset table.content td:first-child { max-width:180px; width:unset;} $fieldset { box-shadow:none; } +body.width1 div.input.float { +} diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 440a728..1da0c4f 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -174,32 +174,36 @@ Volcanos(chat.ONIMPORT, { }) Volcanos(chat.ONACTION, { beforeInputs: function(event, can, button, sub) { + // can.user.isMobile && can._fields.appendChild(sub._target) + // can.user.isMobile && can.onmotion.hidden(can, can._output) + + can.user.isMobile && can.page.style(can, sub._target, html.MAX_HEIGHT, "") can.user.isMobile && can._root.Inputs && can._root.Inputs.appendChild(sub._target) 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("street_name", "粤海街道") sub.Option("school_name", "深圳中学") - sub.Option("company_name", "云境互联") - // sub.Option("company_name", "老邵木器加工") - sub.Option("place_name", "易尚三维") + sub.Option("company_name", "云轩领航") + sub.Option("place_name", "软件产业基地") sub.Option("queue_name", "二楼产检") - sub.Option("group_name", "爬山群") + sub.Option("group_name", "销售部-华东地区") sub.Option("class_name", "初一二班") sub.Option("exam_name", "初一期末考试") sub.Option("store_name", "老邵木器加工") sub.Option("capital_name", "国资委") sub.Option("channel_name", "公众号") sub.Option("cloud_name", "系统云") - // sub.Option("repos_name", "ContextOS") + sub.Option("repos_name", "contexts") sub.Option("story_name", "ContextOS") - sub.Option("reception_name", "科室1") sub.Option("volume_amount", "100") sub.Option("grade", "2024级") }, afterInputs: function(event, can, button, sub) { can.user.isMobile && can.page.style(can, can._root.Action._output, html.VISIBILITY, "") + can.user.isMobile && can.page.style(can, can._root.Action._target, html.DISPLAY, "") + can.user.isMobile && can.onmotion.toggle(can, can._output, true) }, }) Volcanos(chat.ONEXPORT, {