Merge branch 'master' into 295

This commit is contained in:
Rijn Bian 2017-02-21 11:56:05 -06:00 committed by GitHub
commit 45ad8fb843
4 changed files with 32 additions and 15 deletions

View file

@ -1,22 +1,32 @@
<style>
body{
height: 2000px !important;
<style lang="less">
.vertical-center-modal{
display: flex;
align-items: center;
justify-content: center;
.ivu-modal{
top: 0;
}
}
</style>
<template>
<i-button type="primary" @click="modal1 = true">显示对话框</i-button>
<i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
scrollable:{{scrollable}}
<i-button @click="modal9 = true">距离顶部 20px</i-button>
<Modal
:visible.sync="modal1"
title="普通的Modal对话框标题"
:scrollable="scrollable"
@on-ok="ok"
@on-cancel="cancel">
title="对话框标题"
:visible.sync="modal9"
:style="{top: '20px'}">
<p>对话框内容</p>
<p>对话框内容</p>
<p>对话框内容</p>
</Modal>
<i-button @click="modal10 = true">垂直居中</i-button>
<Modal
title="对话框标题"
:visible.sync="modal10"
class-name="vertical-center-modal">
<p>对话框内容</p>
<p>对话框内容</p>
<p>对话框内容</p>
<i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
</Modal>
<i-button @click="instance(true)">Create Instance Scrollable</i-button>
<i-button @click="instance(false)">Create Instance Non-scrollable</i-button>
@ -25,6 +35,8 @@
export default {
data () {
return {
modal9: false,
modal10: false,
modal1: false,
scrollable: false
}