github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

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
parent 7e22785a58 e2e63e698f
commit 5fecffa353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/popconfirm/src/main.vue
View File

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