fixed #704
This commit is contained in:
parent
4fffb066ab
commit
300bd6623e
3 changed files with 71 additions and 11 deletions
|
@ -82,11 +82,15 @@
|
|||
</div>
|
||||
<div :class="[prefixCls + '-footer']" v-if="showSlotFooter" ref="footer"><slot name="footer"></slot></div>
|
||||
</div>
|
||||
<Spin fix size="large" v-if="loading">
|
||||
<slot name="loading"></slot>
|
||||
</Spin>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import tableHead from './table-head.vue';
|
||||
import tableBody from './table-body.vue';
|
||||
import Spin from '../spin/spin.vue';
|
||||
import { oneOf, getStyle, deepCopy, getScrollBarSize } from '../../utils/assist';
|
||||
import { on, off } from '../../utils/dom';
|
||||
import Csv from '../../utils/csv';
|
||||
|
@ -101,7 +105,7 @@
|
|||
export default {
|
||||
name: 'Table',
|
||||
mixins: [ Locale ],
|
||||
components: { tableHead, tableBody },
|
||||
components: { tableHead, tableBody, Spin },
|
||||
props: {
|
||||
data: {
|
||||
type: Array,
|
||||
|
@ -159,6 +163,10 @@
|
|||
},
|
||||
disabledHover: {
|
||||
type: Boolean
|
||||
},
|
||||
loading: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data () {
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
left: 0;
|
||||
z-index: @zindex-spin;
|
||||
.square(100%);
|
||||
background-color: rgba(255,255,255,.95);
|
||||
background-color: rgba(255,255,255,.9);
|
||||
}
|
||||
|
||||
&-fix &-main {
|
||||
|
@ -56,6 +56,15 @@
|
|||
}
|
||||
}
|
||||
|
||||
// use in Table loading, Table right border is not included in .ivu-table-wrapper, so fix it
|
||||
.@{table-prefix-cls}-wrapper{
|
||||
> .@{spin-prefix-cls}-fix{
|
||||
border: 1px solid @border-color-base;
|
||||
border-top: 0;
|
||||
border-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes ani-spin-bounce {
|
||||
0% {
|
||||
transform: scale(0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue