drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iButton add some func

Browse source 
iButton add some func
This commit is contained in:
梁灏 2016-11-01 17:01:59 +08:00
parent 72493927e1
commit 698e3b614d
7 changed files with 96 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/button/button.vue
View file

@ -2,7 +2,7 @@
<button :type="htmlType" :class="classes" :disabled="disabled">
<i :class="loadingIconClasses" v-if="loading"></i>
<i :class="typeIconClasses" v-if="icon && !loading"></i>
<slot></slot>
<span v-if="showSlot" v-el:slot><slot></slot></span>
</button>
</template>
<script>
@ -17,7 +17,7 @@
props: {
type: {
validator (value) {
return oneOf(value, ['primary', 'ghost']);
return oneOf(value, ['primary', 'ghost', 'dashed', 'text']);
}
},
shape: {
@ -40,6 +40,11 @@
},
icon: String
},
data () {
return {
showSlot: true
}
},
computed: {
classes () {
return [
@ -48,7 +53,8 @@
[`${prefixCls}-${this.type}`]: !!this.type,
[`${prefixCls}-${this.shape}`]: !!this.shape,
[`${prefixCls}-${this.size}`]: !!this.size,
[`${prefixCls}-loading`]: this.loading != null && this.loading
[`${prefixCls}-loading`]: this.loading != null && this.loading,
[`${prefixCls}-icon-only`]: !this.showSlot && (!!this.icon || this.loading)
}
]
},
@ -63,6 +69,9 @@
}
]
}
},
ready () {
this.showSlot = this.$els.slot.innerHTML !== '';
}
}
</script>