This commit is contained in:
IT 老营长 @云轩领航-创始人 2025-05-12 11:10:37 +08:00
parent 7b95b73107
commit b5fa19fea2
3 changed files with 17 additions and 4 deletions

View File

@ -222,6 +222,9 @@ func (s Table) SelectDetail(m *ice.Message, arg ...string) *ice.Message {
} }
func (s Table) SelectJoinUser(m *ice.Message, arg ...string) *ice.Message { func (s Table) SelectJoinUser(m *ice.Message, arg ...string) *ice.Message {
kit.If(len(arg) == 0, func() { arg = append(arg, model.NAME, model.AVATAR) }) kit.If(len(arg) == 0, func() { arg = append(arg, model.NAME, model.AVATAR) })
if len(m.Appendv(model.USER_UID)) == 0 {
return m
}
return s.SelectJoin(m, user{}, arg...) return s.SelectJoin(m, user{}, arg...)
} }
func (s Table) SelectJoinCity(m *ice.Message, arg ...string) *ice.Message { func (s Table) SelectJoinCity(m *ice.Message, arg ...string) *ice.Message {

View File

@ -130,6 +130,16 @@ $output table.content.detail tr.action input.icons { display:unset; }
$output table.content.detail tr.action i { display:none; } $output table.content.detail tr.action i { display:none; }
$output table.content.detail tr.uid { display:none; } $output table.content.detail tr.uid { display:none; }
$output table.content.detail input { border:none; } $output table.content.detail input { border:none; }
$output fieldset.story>div.output>div.tabs {
background-color:var(--plugin-bg-color); display:flex; position:sticky; top:0; z-index:1;
overflow:auto;
}
$output fieldset.story>div.output>div.tabs>div.item { white-space:pre; padding:5px; width:100%; }
$output fieldset.story>div.output>div.tabs>div.item.select { background-color:var(--output-bg-color); border-top:var(--box-notice); }
$output fieldset.story>div.output>div.tabs>div.item.danger.select { background-color:var(--output-bg-color); border-top:var(--box-danger); }
$output fieldset.story>div.output>div.tabs>div.item:hover { background-color:var(--output-bg-color); }
$output>div.output>div.code { padding:10px; } $output>div.output>div.code { padding:10px; }
$output>fieldset.story { margin-top:48px; } $output>fieldset.story { margin-top:48px; }
$output fieldset.story { box-shadow:none; } $output fieldset.story { box-shadow:none; }

View File

@ -55,7 +55,7 @@ Volcanos(chat.ONIMPORT, {
can.user.isMobile && (can.db.hash = []) can.user.isMobile && (can.db.hash = [])
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]) 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.sup._goback) { can.db.hash = can.db.hash.slice(0, 1) } if (can.sup._goback) { can.db.hash = can.db.hash.slice(0, 1) }
if (can.db.hash.length > 1 && can.db.hash[1]) { if (can.db.hash.length > 1 && can.db.hash[1] && can.db.hash[1] != can.ConfIndex()) {
can.sup.current = can.onimport.myTrans(can, kit.Dict(msg.OptionSimple(PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME))) can.sup.current = can.onimport.myTrans(can, kit.Dict(msg.OptionSimple(PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME)))
return can.runAction({}, ctx.COMMAND, [can.db.hash[1]], function(msg) { msg.Table(function(value) { return can.runAction({}, 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) value.args = [can.db.hash[0]].concat(can.db.hash.slice(2)), can.onimport.myStory(can, value)
@ -89,9 +89,9 @@ Volcanos(chat.ONIMPORT, {
"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) ))) } 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) } if (_msg.Length() == 0) { can.onimport.myOrder(can, msg, can.ui.myorder) } else { showIndex(can._index_msg = msg) }
can.user.agent.init(can, [msg.Option(CITY_NAME), msg.Option(STREET_NAME), msg.Option("auth_info")].join(" "), msg.Option("auth_avatar")) // can.user.agent.init(can, [msg.Option(CITY_NAME), msg.Option(STREET_NAME), msg.Option("auth_info")].join(" "), msg.Option("auth_avatar"))
msg.Echo([msg.Option(CITY_NAME), msg.Option(STREET_NAME), msg.Option(PLACE_NAME)].join(" ")) msg.Echo([msg.Option(CITY_NAME), msg.Option(STREET_NAME), msg.Option(PLACE_NAME)].join(" "))
can.onexport.value(can, can.sup.current) // can.onexport.value(can, can.sup.current)
can.misc.isDebug(can) && can.onimport.qrcode(can, msg, can.sup.current.auth_avatar) can.misc.isDebug(can) && can.onimport.qrcode(can, msg, can.sup.current.auth_avatar)
} }
}, },
@ -261,7 +261,7 @@ Volcanos(chat.ONEXPORT, {
place: function(can, value) { return can.onexport.session(can, PLACE_UID, value) }, place: function(can, value) { return can.onexport.session(can, PLACE_UID, value) },
value: function(can, value) { if (!value || !value._uid) { return } can.sup.current = value, can.onexport.index(can, can.sup.current) value: function(can, value) { if (!value || !value._uid) { 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.onexport.place(can, value._uid), can.onexport.hash(can, value._uid), can.onexport.title(can, value._name, can.ConfHelp())
can.user.agent.init(can, value.city_name+" "+value._street) // can.user.agent.init(can, value.city_name+" "+value._street)
can.page.Select(can, can.ui._target, "div.item.card.uid-"+value._uid, function(target) { can.page.Select(can, can.ui._target, "div.item.card.uid-"+value._uid, function(target) {
can.onmotion.select(can, can.ui._target, html.DIV_ITEM, target) can.onmotion.select(can, can.ui._target, html.DIV_ITEM, target)
can.onmotion.scrollIntoView(can, target) can.onmotion.scrollIntoView(can, target)