Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323 from pandadtdyy/fix_nav_dropdown

Browse Source 
ui: add disabledconstrainToWindow to avoid filp
This commit is contained in:
undefined authored and GitHub committed 2022-03-21 11:21:46 +08:00
2 parents 32651a283a 2a5c465c95
commit 70f5cf7d9f
3 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/components/dropdown/Dropdown.js
+1 -1
View File
@@ -30,7 +30,7 @@ export default class Dropdown extends DOMAttachedObject {
content: this.options.target || $.find($dom.attr('data-dropdown-target'))[0], content: this.options.target || $.find($dom.attr('data-dropdown-target'))[0],
position: this.options.position, position: this.options.position,
openOn: 'hover', openOn: 'hover',
constrainToWindow: true, constrainToWindow: $dom.attr('data-dropdown-disabledconstrainToWindow') === undefined,
constrainToScrollParent: false, constrainToScrollParent: false,
}); });
this.dropInstance.on('open', this.onDropOpen.bind(this)); this.dropInstance.on('open', this.onDropOpen.bind(this));
packages/ui-default/components/dropdown/dropdown.page.styl
+4
View File
@@ -4,6 +4,10 @@
.drop .dropdown-target .drop .dropdown-target
display: block display: block
.dropdown
max-height: calc(100% - 60px)
overflow-y: auto
.dropdown .dropdown
.menu .menu
min-width: rem(150px) min-width: rem(150px)
packages/ui-default/templates/partials/nav.html
+2 -2
View File
@@ -18,7 +18,7 @@
{% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} {% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
<li class="nav__list-item"><a href="{{ url('user_login') }}" class="nav__item" name="nav_login">{{ _('Login') }}</a></li> <li class="nav__list-item"><a href="{{ url('user_login') }}" class="nav__item" name="nav_login">{{ _('Login') }}</a></li>
<li class="nav__list-item"><a href="{{ url('user_register') }}" class="nav__item--round">{{ _('Sign Up') }}</a></li> <li class="nav__list-item"><a href="{{ url('user_register') }}" class="nav__item--round">{{ _('Sign Up') }}</a></li>
<li class="nav__list-item" data-dropdown-pos="bottom right" data-dropdown-target="#menu-nav-user" data-dropdown-trigger-desktop-only> <li class="nav__list-item" data-dropdown-pos="bottom right" data-dropdown-target="#menu-nav-user" data-dropdown-disabledconstrainToWindow data-dropdown-trigger-desktop-only>
<a href="javascript:;" class="nav__item"> <a href="javascript:;" class="nav__item">
<span class="icon icon-global"></span>Language <span class="icon icon-expand_more"></span> <span class="icon icon-global"></span>Language <span class="icon icon-expand_more"></span>
</a> </a>
@@ -29,7 +29,7 @@
</ol> </ol>
</li> </li>
{% else %} {% else %}
<li class="nav__list-item" data-dropdown-pos="bottom right" data-dropdown-target="#menu-nav-user" data-dropdown-trigger-desktop-only> <li class="nav__list-item" data-dropdown-pos="bottom right" data-dropdown-target="#menu-nav-user" data-dropdown-disabledconstrainToWindow data-dropdown-trigger-desktop-only>
<a href="{{ url('user_detail', uid=handler.user._id) }}" class="nav__item">{{ handler.user.uname }} <span class="icon icon-expand_more nojs--hide"></span></a> <a href="{{ url('user_detail', uid=handler.user._id) }}" class="nav__item">{{ handler.user.uname }} <span class="icon icon-expand_more nojs--hide"></span></a>
<ol class="dropdown-target menu" id="menu-nav-user"> <ol class="dropdown-target menu" id="menu-nav-user">
<li class="menu__item"> <li class="menu__item">