Skip to content

解决了示例网站在不同窗口大小下菜单栏显示问题 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ParnDeedlit merged 2 commits into from
Apr 13, 2021
Merged

解决了示例网站在不同窗口大小下菜单栏显示问题 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4fe04
解决了示例网站在不同窗口大小下菜单栏显示问题
yuchao-xie Apr 13, 2021
44c368c
调整了弹出框的最大宽度和最大高度
yuchao-xie Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion website/src/components/IconFont/iconfont.js
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 58 additions & 13 deletions website/src/views/layout/components/Header/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,15 @@
</span>
</div>
</router-link>
<div class="mapgis-webclient-menu">
<el-popover
<IconFont
:style="style"
type="iconicon_commonly_barmenu"
class="mapgis-webclient-menu-icon"
@click="isShowMenu = !isShowMenu"
/>
<div :class="['mapgis-webclient-menu',{'is-show':isShowMenu}]">
<div class="mapgis-webclient-nav">
<el-popover
v-for="(h,i) in mobile ? mobileHeaders : headers"
:key="i"
placement="top-start"
Expand Down Expand Up @@ -54,6 +61,7 @@
>{{h.title}}</el-button>
</el-popover>
</div>
</div>
</div>
</div>
</template>
Expand Down Expand Up @@ -82,6 +90,12 @@ export default {
subheaders: [],
mobileHeaders: [],
mobileSubheaders: [],
isShowMenu: false,
style: {
fontSize: '24px',
color: '#FFFFFF',
lineHeight: '72px'
}
};
},
created () {
Expand Down Expand Up @@ -205,26 +219,57 @@ export default {
}
}

.mapgis-webclient-menu {
width: fit-content;
margin-right: 92px;
height: 72px;
align-items: center;
.mapgis-webclient-menu-icon {
float: right;
height: 72px;
margin-right: 48px;
cursor: pointer;
display: none;

@media screen and (max-width: 1220px) {
display: block;
}
}

.mapgis-webclient-menu {
z-index: 200;
position: relative;
display: flex;
align-items: center;

.mapgis-webclient-nav {
margin-left: auto;
margin-right: 92px;
}

@media screen and (max-width: 1220px) {
width: 100%;
flex-wrap: wrap;
background-color: rgba(37, 45, 69, .5);
display: none;

&.is-show {
display: flex;
}
}

span {
width: fit-content;
// height: 16px;
margin: 0px 6px;
padding: 0px 2px;
// margin-left: 12.5px;
height: 72px;
// margin: 0px 6px;
padding: 0px 4px;
// margin-let: 12.5px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 500;
text-align: right;
text-align: center;
color: rgba(255, 255, 255, 1);
line-height: 20px;
line-height: 72px;

.el-button {
padding: 0;
border-width: 0;
}
}

span:hover {
Expand Down
4 changes: 4 additions & 0 deletions website/src/views/layout/components/Header/Menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ export default {
<style lang="scss">
.header-menu-wrapper {
display: flex;
flex-wrap: wrap;
width: fit-content;
max-width: 100vw;
max-height: 60vh;
overflow: auto;
.menu-badge {
/* padding-top: -30px !important;
padding-right: -30px !important;
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/welcome/home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ $margin-left: 80px;
}
.home-header {
position: absolute;
z-index: 9999;
z-index: 100;
}
h1 {
height: 36px;
Expand Down