Skip to content

Commit d710c6a

Browse files
committed
fix: #45 height overflow
1 parent 4a0506d commit d710c6a

File tree

3 files changed

+701
-701
lines changed

3 files changed

+701
-701
lines changed

src/App.vue

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
1-
<template>
2-
<a-locale-provider :locale="locale">
3-
<div id="app">
4-
<router-view/>
5-
</div>
6-
</a-locale-provider>
7-
</template>
8-
9-
<script>
10-
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
11-
import { deviceEnquire, DEVICE_TYPE } from '@/utils/device'
12-
import { version } from 'ant-design-vue'
13-
14-
export default {
15-
data () {
16-
return {
17-
locale: zhCN,
18-
version
19-
}
20-
},
21-
mounted () {
22-
const { $store } = this
23-
console.log('use Ant-Design Of Vue:', version)
24-
deviceEnquire(deviceType => {
25-
26-
switch (deviceType) {
27-
case DEVICE_TYPE.DESKTOP:
28-
$store.commit('TOGGLE_DEVICE', 'desktop')
29-
$store.dispatch('setSidebar', true)
30-
break
31-
case DEVICE_TYPE.TABLET:
32-
console.log('tablet')
33-
$store.dispatch('ToggleDevice', 'tablet')
34-
$store.dispatch('setSidebar', false)
35-
break
36-
case DEVICE_TYPE.MOBILE:
37-
default:
38-
$store.commit('TOGGLE_DEVICE', 'mobile')
39-
$store.dispatch('setSidebar', false)
40-
break
41-
}
42-
console.log('deviceType', deviceType)
43-
})
44-
}
45-
}
46-
</script>
1+
<template>
2+
<a-locale-provider :locale="locale">
3+
<div id="app">
4+
<router-view/>
5+
</div>
6+
</a-locale-provider>
7+
</template>
8+
9+
<script>
10+
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
11+
import { deviceEnquire, DEVICE_TYPE } from '@/utils/device'
12+
import { version } from 'ant-design-vue'
13+
14+
export default {
15+
data () {
16+
return {
17+
locale: zhCN,
18+
version
19+
}
20+
},
21+
mounted () {
22+
const { $store } = this
23+
console.log('use Ant-Design Of Vue:', version)
24+
deviceEnquire(deviceType => {
25+
26+
switch (deviceType) {
27+
case DEVICE_TYPE.DESKTOP:
28+
$store.commit('TOGGLE_DEVICE', 'desktop')
29+
$store.dispatch('setSidebar', true)
30+
break
31+
case DEVICE_TYPE.TABLET:
32+
console.log('tablet')
33+
$store.dispatch('ToggleDevice', 'tablet')
34+
$store.dispatch('setSidebar', false)
35+
break
36+
case DEVICE_TYPE.MOBILE:
37+
default:
38+
$store.commit('TOGGLE_DEVICE', 'mobile')
39+
$store.dispatch('setSidebar', false)
40+
break
41+
}
42+
console.log('deviceType', deviceType)
43+
})
44+
}
45+
}
46+
</script>
47+
<style>
48+
#app {
49+
height: 100%;
50+
}
51+
</style>

src/components/page/GlobalFooter.vue

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,55 @@
1-
<template>
2-
<div class="footer">
3-
<div class="links">
4-
<a href="https://pro.ant.design/" target="_blank">Pro 首页</a>
5-
<a href="https://github.com/ant-design/ant-design-pro" target="_blank">
6-
<a-icon type="github"/>
7-
</a>
8-
<a href="https://ant.design/">Ant Design</a>
9-
<a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
10-
<a>Antd-Vue Version@{{ version }}</a>
11-
</div>
12-
<div class="copyright">
13-
Copyright
14-
<a-icon type="copyright"/>
15-
2018 <span>白鹭学园技术组出品</span>
16-
</div>
17-
</div>
18-
</template>
19-
20-
<script>
21-
import { version } from 'ant-design-vue'
22-
export default {
23-
name: 'LayoutFooter',
24-
data () {
25-
return {
26-
version
27-
}
28-
}
29-
}
30-
</script>
31-
32-
<style lang="scss" scoped>
33-
.footer {
34-
padding: 0 16px;
35-
margin: 48px 0 24px;
36-
text-align: center;
37-
38-
.links {
39-
margin-bottom: 8px;
40-
41-
a {
42-
color: rgba(0, 0, 0, .45);
43-
44-
&:hover {
45-
color: rgba(0, 0, 0, .65);
46-
}
47-
48-
&:not(:last-child) {
49-
margin-right: 40px;
50-
}
51-
}
52-
}
53-
.copyright {
54-
color: rgba(0, 0, 0, .45);
55-
font-size: 14px;
56-
}
57-
}
1+
<template>
2+
<div class="footer">
3+
<div class="links">
4+
<a href="https://pro.ant.design/" target="_blank">Pro 首页</a>
5+
<a href="https://github.com/ant-design/ant-design-pro" target="_blank">
6+
<a-icon type="github"/>
7+
</a>
8+
<a href="https://ant.design/">Ant Design</a>
9+
<a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
10+
</div>
11+
<div class="copyright">
12+
Copyright
13+
<a-icon type="copyright"/>
14+
2018 <span>白鹭学园技术组出品</span>
15+
</div>
16+
</div>
17+
</template>
18+
19+
<script>
20+
export default {
21+
name: 'LayoutFooter',
22+
data () {
23+
return {
24+
}
25+
}
26+
}
27+
</script>
28+
29+
<style lang="scss" scoped>
30+
.footer {
31+
padding: 0 16px;
32+
margin: 48px 0 24px;
33+
text-align: center;
34+
35+
.links {
36+
margin-bottom: 8px;
37+
38+
a {
39+
color: rgba(0, 0, 0, .45);
40+
41+
&:hover {
42+
color: rgba(0, 0, 0, .65);
43+
}
44+
45+
&:not(:last-child) {
46+
margin-right: 40px;
47+
}
48+
}
49+
}
50+
.copyright {
51+
color: rgba(0, 0, 0, .45);
52+
font-size: 14px;
53+
}
54+
}
5855
</style>

0 commit comments

Comments
 (0)