update vc-tabs
parent
b7027ca779
commit
4ab5cf70d8
|
@ -1,6 +1,6 @@
|
|||
import Tabs from './tabs'
|
||||
import TabPane from './src/TabPane'
|
||||
import TabContent from './src/TabContent'
|
||||
import TabPane from '../vc-tabs/src/TabPane'
|
||||
import TabContent from '../vc-tabs/src/TabContent'
|
||||
Tabs.TabPane = TabPane
|
||||
export default Tabs
|
||||
export { TabPane, TabContent }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
import Tabs from './src/Tabs'
|
||||
import Tabs from '../vc-tabs/src/Tabs'
|
||||
import isFlexSupported from '../_util/isFlexSupported'
|
||||
import { hasProp, getComponentFromProp, getComponentName, isEmptyElement } from '../_util/props-util'
|
||||
import warning from '../_util/warning'
|
||||
|
|
|
@ -93,6 +93,20 @@ export default {
|
|||
newState.statePageSize = val
|
||||
this.setState(newState)
|
||||
},
|
||||
stateCurrent(val, oldValue) {
|
||||
// When current page change, fix focused style of prev item
|
||||
// A hacky solution of https://github.com/ant-design/ant-design/issues/8948
|
||||
this.$nextTick(()=>{
|
||||
if(this.$refs.paginationNode) {
|
||||
const lastCurrentNode = this.$refs.paginationNode.querySelector(
|
||||
`.${this.prefixCls}-item-${oldValue}`
|
||||
);
|
||||
if (lastCurrentNode && document.activeElement === lastCurrentNode) {
|
||||
lastCurrentNode.blur();
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
isValid (page) {
|
||||
|
@ -494,6 +508,7 @@ export default {
|
|||
<ul
|
||||
class={`${prefixCls}`}
|
||||
unselectable='unselectable'
|
||||
ref='paginationNode'
|
||||
>
|
||||
{totalText}
|
||||
<li
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
// base rc-table 6.1.7 7cd6abab4a2bd55adc7a9207c23feb62c3cd015b
|
||||
import T from './src/Table'
|
||||
import Column from './src/Column'
|
||||
import ColumnGroup from './src/ColumnGroup'
|
||||
|
|
|
@ -36,7 +36,8 @@ function offset (elem) {
|
|||
|
||||
function componentDidUpdate (component, init) {
|
||||
const { styles = {}} = component.$props
|
||||
const wrapNode = component.$refs.nav || component.$refs.root
|
||||
const rootNode = component.$refs.root
|
||||
const wrapNode = component.$refs.nav || rootNode
|
||||
const containerOffset = offset(wrapNode)
|
||||
const inkBarNode = component.$refs.inkBar
|
||||
const activeTab = component.$refs.activeTab
|
||||
|
@ -57,7 +58,7 @@ function componentDidUpdate (component, init) {
|
|||
// If tabNode'width width equal to wrapNode'width when tabBarPosition is top or bottom
|
||||
// It means no css working, then ink bar should not have width until css is loaded
|
||||
// Fix https://github.com/ant-design/ant-design/issues/7564
|
||||
if (width === wrapNode.offsetWidth) {
|
||||
if (width === rootNode.offsetWidth) {
|
||||
width = 0
|
||||
} else if (styles.inkBar && styles.inkBar.width !== undefined) {
|
||||
width = parseFloat(styles.inkBar.width, 10)
|
|
@ -43,8 +43,8 @@ export default {
|
|||
cls += ` ${prefixCls}-tab-disabled`
|
||||
} else {
|
||||
}
|
||||
const onClick = () => {
|
||||
!disabled && this.__emit('tabClick', tabKey)
|
||||
const onClick = (e) => {
|
||||
!disabled && this.__emit('tabClick', tabKey, e)
|
||||
}
|
||||
|
||||
let tabC = typeof tab === 'function' ? child.tab(h) : tab
|
|
@ -89,8 +89,8 @@ export default {
|
|||
}
|
||||
return activeKey
|
||||
},
|
||||
handleTabClick (activeKey) {
|
||||
this.__emit('tabClick', activeKey)
|
||||
handleTabClick (activeKey,e) {
|
||||
this.__emit('tabClick', activeKey, e)
|
||||
this.setActiveKey(activeKey)
|
||||
},
|
||||
|
Loading…
Reference in New Issue