update vc-xxx

pull/9/head
tangjinzhou 2018-03-09 12:20:21 +08:00
parent 412bdc567a
commit 4775dc34b7
6 changed files with 14 additions and 11 deletions

View File

@ -89,7 +89,7 @@ export default {
const overlayNode = this.getPopupDomNode() const overlayNode = this.getPopupDomNode()
const rootNode = this.$el const rootNode = this.$el
if (rootNode && overlayNode && rootNode.offsetWidth > overlayNode.offsetWidth) { if (rootNode && overlayNode && rootNode.offsetWidth > overlayNode.offsetWidth) {
overlayNode.style.width = `${rootNode.offsetWidth}px` overlayNode.style.minWidth = `${rootNode.offsetWidth}px`
if (this.$refs.trigger && if (this.$refs.trigger &&
this.$refs.trigger._component && this.$refs.trigger._component &&
this.$refs.trigger._component.alignInstance) { this.$refs.trigger._component.alignInstance) {

View File

@ -35,7 +35,7 @@ export default {
title: 'Modal', title: 'Modal',
render () { render () {
return ( return (
<div> <div id='components-modal-demo'>
<md cn={md.cn} us={md.us}/> <md cn={md.cn} us={md.us}/>
<Async/> <Async/>
<Basic/> <Basic/>
@ -57,7 +57,7 @@ export default {
</script> </script>
<style> <style>
.code-box-demo .ant-btn { #components-modal-demo .ant-btn {
margin-right: 8px; margin-right: 8px;
} }
</style> </style>

View File

@ -28,7 +28,7 @@ export default {
title: 'TimePicker', title: 'TimePicker',
render () { render () {
return ( return (
<div> <div id='components-timepicker-demo'>
<md cn={md.cn} us={md.us}/> <md cn={md.cn} us={md.us}/>
<Hours/> <Hours/>
<Addon/> <Addon/>
@ -48,5 +48,5 @@ export default {
} }
</script> </script>
<style> <style>
.code-box-demo .ant-time-picker { margin: 0 8px 12px 0; } #components-timepicker-demo .ant-time-picker { margin: 0 8px 12px 0; }
</style> </style>

View File

@ -276,14 +276,16 @@ export default {
</li> </li>
) )
} }
const hasPrev = this.hasPrev()
const hasNext = this.hasNext()
return ( return (
<ul class={`${prefixCls} ${prefixCls}-simple`}> <ul class={`${prefixCls} ${prefixCls}-simple`}>
<li <li
title={this.showTitle ? locale.prev_page : null} title={this.showTitle ? locale.prev_page : null}
onClick={this.prev} onClick={this.prev}
tabIndex='0' tabIndex={hasPrev ? 0 : null}
onKeypress={this.runIfEnterPrev} onKeypress={this.runIfEnterPrev}
class={`${this.hasPrev() ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`} class={`${hasPrev ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`}
aria-disabled={!this.hasPrev()} aria-disabled={!this.hasPrev()}
> >
{this.itemRender(prevPage, 'prev', <a class={`${prefixCls}-item-link`} />)} {this.itemRender(prevPage, 'prev', <a class={`${prefixCls}-item-link`} />)}
@ -308,7 +310,7 @@ export default {
onClick={this.next} onClick={this.next}
tabIndex='0' tabIndex='0'
onKeypress={this.runIfEnterNext} onKeypress={this.runIfEnterNext}
class={`${this.hasNext() ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`} class={`${hasNext ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={!this.hasNext()} aria-disabled={!this.hasNext()}
> >
{this.itemRender(nextPage, 'next', <a class={`${prefixCls}-item-link`} />)} {this.itemRender(nextPage, 'next', <a class={`${prefixCls}-item-link`} />)}
@ -492,7 +494,7 @@ export default {
<li <li
title={this.showTitle ? locale.prev_page : null} title={this.showTitle ? locale.prev_page : null}
onClick={this.prev} onClick={this.prev}
tabIndex='0' tabIndex={prevDisabled ? null : 0}
onKeypress={this.runIfEnterPrev} onKeypress={this.runIfEnterPrev}
class={`${!prevDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`} class={`${!prevDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`}
aria-disabled={prevDisabled} aria-disabled={prevDisabled}
@ -503,7 +505,7 @@ export default {
<li <li
title={this.showTitle ? locale.next_page : null} title={this.showTitle ? locale.next_page : null}
onClick={this.next} onClick={this.next}
tabIndex='0' tabIndex={nextDisabled ? null : 0}
onKeypress={this.runIfEnterNext} onKeypress={this.runIfEnterNext}
class={`${!nextDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`} class={`${!nextDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={nextDisabled} aria-disabled={nextDisabled}

View File

@ -377,6 +377,7 @@ export default {
onArrowClick (e) { onArrowClick (e) {
e.stopPropagation() e.stopPropagation()
e.preventDefault()
if (!this.disabled) { if (!this.disabled) {
this.setOpenState(!this.openStatus, !this.openStatus) this.setOpenState(!this.openStatus, !this.openStatus)
} }

View File

@ -26,7 +26,7 @@ Modal | done
Alert | done Alert | done
Calendar Calendar
DatePicker DatePicker
TimePicker TimePicker | done
Upload Upload
Form Form
Carousel Carousel