Merge pull request #20622 from iamkun/fix/error-i18n-prop

fix: fix Popconfirm i18n bug
pull/20626/head
Peng Gao 2020-12-28 16:59:23 +08:00 committed by GitHub
commit 5fecffa353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions

View File

@ -20,14 +20,14 @@
:type="cancelButtonType"
@click="cancel"
>
{{cancelButtonText}}
{{ displayCancelButtonText }}
</el-button>
<el-button
size="mini"
:type="confirmButtonType"
@click="confirm"
>
{{confirmButtonText}}
{{ displayConfirmButtonText }}
</el-button>
</div>
</div>
@ -47,12 +47,10 @@ export default {
type: String
},
confirmButtonText: {
type: String,
default: t('el.popconfirm.confirmButtonText')
type: String
},
cancelButtonText: {
type: String,
default: t('el.popconfirm.cancelButtonText')
type: String
},
confirmButtonType: {
type: String,
@ -84,6 +82,14 @@ export default {
visible: false
};
},
computed: {
displayConfirmButtonText() {
return this.confirmButtonText || t('el.popconfirm.confirmButtonText')
},
displayCancelButtonText() {
return this.cancelButtonText || t('el.popconfirm.cancelButtonText')
}
},
methods: {
confirm() {
this.visible = false;