fixed #1387 and update v-transfer-dom

Modal add transfer prop
This commit is contained in:
梁灏 2017-07-19 13:58:20 +08:00
parent 3e4bab9655
commit 548eac43fe
10 changed files with 205 additions and 101 deletions

View file

@ -12,7 +12,8 @@
ref="drop"
@mouseenter.native="handleMouseenter"
@mouseleave.native="handleMouseleave"
v-transfer-dom:forbidden="transfer"><slot name="list"></slot></Drop>
:data-transfer="transfer"
v-transfer-dom><slot name="list"></slot></Drop>
</transition>
</div>
</template>

View file

@ -1,5 +1,5 @@
<template>
<div v-transfer-dom>
<div v-transfer-dom :data-transfer="transfer">
<transition :name="transitionNames[1]">
<div :class="maskClasses" v-show="visible" @click="mask"></div>
</transition>
@ -91,6 +91,10 @@
default () {
return ['ease', 'fade'];
}
},
transfer: {
type: Boolean,
default: true
}
},
data () {

View file

@ -20,7 +20,8 @@
v-show="visible"
@mouseenter="handleMouseenter"
@mouseleave="handleMouseleave"
v-transfer-dom:forbidden="transfer">
:data-transfer="transfer"
v-transfer-dom>
<div :class="[prefixCls + '-content']">
<div :class="[prefixCls + '-arrow']"></div>
<div :class="[prefixCls + '-inner']" v-if="confirm">

View file

@ -37,7 +37,7 @@
</table>
</div>
<div :class="[prefixCls + '-fixed']" :style="fixedTableStyle" v-if="isLeftFixed">
<div :class="[prefixCls + '-fixed-header']" v-if="showHeader">
<div :class="fixedHeaderClasses" v-if="showHeader">
<table-head
fixed="left"
:prefix-cls="prefixCls"
@ -59,7 +59,7 @@
</div>
</div>
<div :class="[prefixCls + '-fixed-right']" :style="fixedRightTableStyle" v-if="isRightFixed">
<div :class="[prefixCls + '-fixed-header']" v-if="showHeader">
<div :class="fixedHeaderClasses" v-if="showHeader">
<table-head
fixed="right"
:prefix-cls="prefixCls"
@ -216,6 +216,14 @@
}
];
},
fixedHeaderClasses () {
return [
`${prefixCls}-fixed-header`,
{
[`${prefixCls}-fixed-header-with-empty`]: !this.rebuildData.length
}
];
},
styles () {
let style = {};
if (this.height) {

View file

@ -10,7 +10,8 @@
v-show="!disabled && (visible || always)"
@mouseenter="handleShowPopper"
@mouseleave="handleClosePopper"
v-transfer-dom:forbidden="transfer">
:data-transfer="transfer"
v-transfer-dom>
<div :class="[prefixCls + '-content']">
<div :class="[prefixCls + '-arrow']"></div>
<div :class="[prefixCls + '-inner']"><slot name="content">{{ content }}</slot></div>