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

Merge pull request #1546 from TabEnter/2.0

Browse source 
fix #695
This commit is contained in:
Aresn 2017-09-01 16:09:01 +08:00 • committed by GitHub
commit 7b0486680b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/tabs/tabs.vue
View file

@ -24,7 +24,7 @@
<script> <script>
import Icon from '../icon/icon.vue'; import Icon from '../icon/icon.vue';
import Render from '../base/render'; import Render from '../base/render';
import { oneOf, getStyle } from '../../utils/assist'; import { oneOf } from '../../utils/assist';
import Emitter from '../../mixins/emitter'; import Emitter from '../../mixins/emitter';
const prefixCls = 'ivu-tabs'; const prefixCls = 'ivu-tabs';
@ -150,13 +150,13 @@
const index = this.navList.findIndex((nav) => nav.name === this.activeKey); const index = this.navList.findIndex((nav) => nav.name === this.activeKey);
const prevTabs = this.$refs.nav.querySelectorAll(`.${prefixCls}-tab`); const prevTabs = this.$refs.nav.querySelectorAll(`.${prefixCls}-tab`);
const tab = prevTabs[index]; const tab = prevTabs[index];
this.barWidth = parseFloat(getStyle(tab, 'width')); this.barWidth = parseFloat(tab.offsetWidth);
if (index > 0) { if (index > 0) {
let offset = 0; let offset = 0;
const gutter = this.size === 'small' ? 0 : 16; const gutter = this.size === 'small' ? 0 : 16;
for (let i = 0; i < index; i++) { for (let i = 0; i < index; i++) {
offset += parseFloat(getStyle(prevTabs[i], 'width')) + gutter; offset += parseFloat(prevTabs[i].offsetWidth) + gutter;
} }
this.barOffset = offset; this.barOffset = offset;