github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #44 from Leopoldthecoder/next 

update dialog
pull/2/head
FuryBean 2016-08-08 17:31:59 +08:00 committed by GitHub
parent 82b4582c7e 67ea53062e
commit e31cba5ca8
5 changed files with 79 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
examples/docs/dialog.md
View File

@ -60,96 +60,102 @@
## 基本用法 ## 基本用法
<el-button :plain="true" v-on:click="dialogVisible = true">点击打开 Dialog</el-button> <el-button :plain="true" v-on:click.native="dialogVisible = true">点击打开 Dialog</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="提示" :visible.sync="dialogVisible"> <el-dialog title="提示" v-model="dialogVisible">
<span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span> <span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click.native="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
```html ```html
<el-button :plain="true" v-on:click="openDialog">点击打开 Dialog</el-button> <el-button :plain="true" v-on:click.native="dialogVisible = true">点击打开 Dialog</el-button>
<el-dialog title="提示" :visible.sync="dialogVisible"> <el-dialog title="提示" v-model="dialogVisible">
<span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span> <span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click.native="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
``` ```
## 设置尺寸 ## 设置尺寸
<el-button :plain="true" v-on:click="dialogTinyVisible = true">点击打开小尺寸 Dialog</el-button> <el-button :plain="true" v-on:click.native="dialogTinyVisible = true">点击打开小尺寸 Dialog</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="提示" :visible.sync="dialogTinyVisible" size="tiny"> <el-dialog title="提示" v-model="dialogTinyVisible" size="tiny">
<span>这是一段内容</span> <span>这是一段内容</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogTinyVisible = false">取 消</el-button> <el-button @click.native="dialogTinyVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogTinyVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogTinyVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
```html ```html
<el-button :plain="true" v-on:click="dialogTinyVisible = true">点击打开小尺寸 Dialog</el-button> <el-button :plain="true" v-on:click.native="dialogTinyVisible = true">点击打开小尺寸 Dialog</el-button>
<el-dialog title="提示" :visible.sync="dialogTinyVisible" size="tiny"> <el-dialog title="提示" v-model="dialogTinyVisible" size="tiny">
<span>这是一段内容</span> <span>这是一段内容</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogTinyVisible = false">取 消</el-button> <el-button @click.native="dialogTinyVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogTinyVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogTinyVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
``` ```
<el-button v-on:click="dialogFullVisible = true">点击打开全屏幕 Dialog</el-button> <el-button v-on:click.native="dialogFullVisible = true">点击打开全屏幕 Dialog</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="提示" :visible.sync="dialogFullVisible" size="full"> <el-dialog title="提示" v-model="dialogFullVisible" size="full">
<img src="http://placekitten.com/1920/1280" class="full-image"> <img src="http://placekitten.com/1920/1280" class="full-image">
</el-dialog> </el-dialog>
</div> </div>
```html ```html
<el-button v-on:click="dialogFullVisible = true">点击打开全屏幕 Dialog</el-button> <el-button v-on:click.native="dialogFullVisible = true">点击打开全屏幕 Dialog</el-button>
<el-dialog title="提示" :visible.sync="dialogFullVisible" size="full"> <el-dialog title="提示" v-model="dialogFullVisible" size="full">
<img src="http://placekitten.com/1920/1280"> <img src="http://placekitten.com/1920/1280">
</el-dialog> </el-dialog>
``` ```
## 设置能否通过点击modal或按下esc关闭dialog ## 设置能否通过点击modal或按下esc关闭dialog
<el-button v-on:click="dialogStubbornVisible = true">打开 Dialog，点击 modal 或按下 esc 关闭无法将其关闭</el-button> <el-button v-on:click.native="dialogStubbornVisible = true">打开 Dialog，点击 modal 或按下 esc 关闭无法将其关闭</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="提示" :visible.sync="dialogStubbornVisible" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog title="提示"
v-model="dialogStubbornVisible"
:close-on-click-modal="false"
:close-on-press-escape="false">
<span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span> <span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span>
</el-dialog> </el-dialog>
</div> </div>
```html ```html
<el-button v-on:click="dialogStubbornVisible = true">打开 Dialog，点击 modal 或按下 esc 关闭无法将其关闭</el-button> <el-button v-on:click.native="dialogStubbornVisible = true">打开 Dialog，点击 modal 或按下 esc 关闭无法将其关闭</el-button>
<el-dialog title="提示" :visible.sync="dialogStubbornVisible" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog title="提示"
v-model="dialogStubbornVisible"
:close-on-click-modal="false"
:close-on-press-escape="false">
<span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span> <span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span>
</el-dialog> </el-dialog>
``` ```
## 自定义内容 ## 自定义内容
<el-button v-on:click="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button> <el-button v-on:click.native="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="收货地址" :visible.sync="dialogTableVisible"> <el-dialog title="收货地址" v-model="dialogTableVisible">
<el-table :data="gridData"> <el-table :data="gridData">
<el-table-column property="date" label="日期" width="150"></el-table-column> <el-table-column property="date" label="日期" width="150"></el-table-column>
<el-table-column property="name" label="姓名" width="200"></el-table-column> <el-table-column property="name" label="姓名" width="200"></el-table-column>
@ -158,11 +164,11 @@
</el-dialog> </el-dialog>
</div> </div>
<el-button v-on:click="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button> <el-button v-on:click.native="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button>
<div class="demo-box demo-dialog"> <div class="demo-box demo-dialog">
<el-dialog title="收货地址" :visible.sync="dialogFormVisible"> <el-dialog title="收货地址" v-model="dialogFormVisible">
<el-form :models="form" v-ref:form> <el-form :models="form">
<el-form-item label="活动名称" :label-width="formLabelWidth"> <el-form-item label="活动名称" :label-width="formLabelWidth">
<el-input :model.sync="form.name" auto-complete="off"></el-input> <el-input :model.sync="form.name" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
@ -174,16 +180,16 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click.native="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogFormVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
```html ```html
<el-button v-on:click="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button> <el-button v-on:click.native="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button>
<el-dialog title="收货地址" :visible.sync="dialogTableVisible"> <el-dialog title="收货地址" v-model="dialogTableVisible">
<el-table :data="gridData"> <el-table :data="gridData">
<el-table-column property="date" label="日期" width="150"></el-table-column> <el-table-column property="date" label="日期" width="150"></el-table-column>
<el-table-column property="name" label="姓名" width="200"></el-table-column> <el-table-column property="name" label="姓名" width="200"></el-table-column>
@ -191,10 +197,10 @@
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-button v-on:click="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button> <el-button v-on:click.native="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button>
<el-dialog title="收货地址" :visible.sync="dialogFormVisible"> <el-dialog title="收货地址" v-model="dialogFormVisible">
<el-form :models="form" v-ref:form> <el-form :models="form">
<el-form-item label="活动名称" :label-width="formLabelWidth"> <el-form-item label="活动名称" :label-width="formLabelWidth">
<el-input :model.sync="form.name" auto-complete="off"></el-input> <el-input :model.sync="form.name" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
@ -206,8 +212,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click.native="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button> <el-button type="primary" @click.native="dialogFormVisible = false">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
``` ```
@ -226,3 +232,10 @@
|------|--------| |------|--------|
| - | dialog 的内容 | | - | dialog 的内容 |
| footer | dialog 按钮操作区的内容 | | footer | dialog 按钮操作区的内容 |
## 方法
每个 el-dialog 实例都暴露了如下方法，用于在不使用 v-model 的情况下打开 / 关闭实例：
| 方法名 | 说明 |
|------|--------|
| open | 打开当前实例 |
| close | 关闭当前实例 |

2
package.json
View File

@ -47,7 +47,7 @@
"vue": "^2.0.0-beta.5", "vue": "^2.0.0-beta.5",
"vue-loader": "^9.2.3", "vue-loader": "^9.2.3",
"vue-markdown-loader": "^0.4.0", "vue-markdown-loader": "^0.4.0",
"vue-popup": "^0.1.8", "vue-popup": "^0.2.1",
"vue-router": "^2.0.0-beta.2" "vue-router": "^2.0.0-beta.2"
} }
} }

2
packages/dialog/package.json
View File

@ -12,6 +12,6 @@
"author": "elemefe", "author": "elemefe",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"vue-popup": "^0.1.8" "vue-popup": "^0.2.1"
} }
} }

23
packages/dialog/src/component.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="el-dialog__wrapper" v-if="visible" transition="dialog-fade" @click.self="handleWrapperClick"> <transition name="dialog-fade">
<div class="el-dialog" :class="[sizeClass, customClass]" v-el:dialog :style="{ 'margin-bottom': size !== 'full' ? '50px' : '', 'top': size !== 'full' ? dynamicTop + 'px' : '0' }"> <div class="el-dialog__wrapper" v-show="value" @click.self="handleWrapperClick">
<div class="el-dialog" :class="[sizeClass, customClass]" ref="dialog" :style="{ 'margin-bottom': size !== 'full' ? '50px' : '', 'top': size !== 'full' ? dynamicTop + 'px' : '0' }">
<div class="el-dialog__header"> <div class="el-dialog__header">
<span class="el-dialog__title">{{title}}</span> <span class="el-dialog__title">{{title}}</span>
<div class="el-dialog__headerbtn"> <div class="el-dialog__headerbtn">
@ -8,9 +9,12 @@
</div> </div>
</div> </div>
<div class="el-dialog__body"><slot></slot></div> <div class="el-dialog__body"><slot></slot></div>
<div class="el-dialog__footer">
<slot name="footer"></slot> <slot name="footer"></slot>
</div> </div>
</div> </div>
</div>
</transition>
</template> </template>
<script> <script>
@ -60,9 +64,14 @@
}, },
watch: { watch: {
visible(val) { value(val) {
if (val) { if (val) {
this.$els.dialog.scrollTop = 0; this.$emit('open');
this.$nextTick(() => {
this.$refs.dialog.scrollTop = 0;
});
} else {
this.$emit('close');
} }
} }
}, },
@ -76,7 +85,7 @@
methods: { methods: {
handleWrapperClick() { handleWrapperClick() {
if (this.closeOnClickModal) { if (this.closeOnClickModal) {
this.visible = false; this.$emit('input', false);
} }
}, },
@ -85,8 +94,8 @@
} }
}, },
ready() { mounted() {
if (this.visible) { if (this.value) {
this.rendered = true; this.rendered = true;
this.open(); this.open();
} }

9
packages/theme-default/src/dialog.css
View File

@ -8,7 +8,6 @@
position: relative; position: relative;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
overflow: hidden;
background: #fff; background: #fff;
border-radius: 2px; border-radius: 2px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
@ -69,20 +68,18 @@
float: right; float: right;
} }
& *[slot=footer] { @e footer {
padding: 10px 20px 15px; padding: 10px 20px 15px;
text-align: right; text-align: right;
width: 100%;
display: block;
box-sizing: border-box; box-sizing: border-box;
} }
} }
.dialog-fade-enter { .dialog-fade-enter-active {
animation: dialog-fade-in .3s; animation: dialog-fade-in .3s;
} }
.dialog-fade-leave { .dialog-fade-leave-active {
animation: dialog-fade-out .3s; animation: dialog-fade-out .3s;
} }