Browse Source

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

fix: fix Popconfirm i18n bug
Peng Gao 4 years ago
parent
commit
5fecffa353
1 changed files with 12 additions and 6 deletions
  1. 12 6
      packages/popconfirm/src/main.vue

+ 12 - 6
packages/popconfirm/src/main.vue

@@ -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,
-      default: t('el.popconfirm.confirmButtonText')
+      type: String
     },
     },
     cancelButtonText: {
     cancelButtonText: {
-      type: String,
-      default: t('el.popconfirm.cancelButtonText')
+      type: String
     },
     },
     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;