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

fixed some components bug that can not translate when using vue-i18n

Browse source
This commit is contained in:
梁灏 2017-03-30 16:05:20 +08:00
parent ed91d9b0c7
commit e5337c810c
8 changed files with 185 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/poptip/poptip.vue
View file

@ -22,8 +22,8 @@
<div :class="[prefixCls + '-body-message']"><slot name="title">{{ title }}</slot></div>
</div>
<div :class="[prefixCls + '-footer']">
<i-button type="text" size="small" @click.native="cancel">{{ cancelText }}</i-button>
<i-button type="primary" size="small" @click.native="ok">{{ okText }}</i-button>
<i-button type="text" size="small" @click.native="cancel">{{ localeCancelText }}</i-button>
<i-button type="primary" size="small" @click.native="ok">{{ localeOkText }}</i-button>
</div>
</div>
<div :class="[prefixCls + '-inner']" v-if="!confirm">
@ -42,13 +42,13 @@
import iButton from '../button/button.vue';
import clickoutside from '../../directives/clickoutside';
import { oneOf } from '../../utils/assist';
import { t } from '../../locale';
import Locale from '../../mixins/locale';
const prefixCls = 'ivu-poptip';
export default {
name: 'Poptip',
mixins: [Popper],
mixins: [ Popper, Locale ],
directives: { clickoutside },
components: { iButton },
props: {
@ -79,16 +79,10 @@
default: false
},
okText: {
type: String,
default () {
return t('i.poptip.okText');
}
type: String
},
cancelText: {
type: String,
default () {
return t('i.poptip.cancelText');
}
type: String
}
},
data () {
@ -114,6 +108,20 @@
style.width = `${this.width}px`;
}
return style;
},
localeOkText () {
if (this.okText === undefined) {
return this.t('i.poptip.okText');
} else {
return this.okText;
}
},
localeCancelText () {
if (this.cancelText === undefined) {
return this.t('i.poptip.cancelText');
} else {
return this.cancelText;
}
}
},
methods: {