diff --git a/packages/number-keyboard/Key.vue b/packages/number-keyboard/Key.vue
index 757036f20..98b0e62ac 100644
--- a/packages/number-keyboard/Key.vue
+++ b/packages/number-keyboard/Key.vue
@@ -1,12 +1,11 @@
@@ -34,8 +33,7 @@ export default create({
className() {
const types = this.type.slice(0);
this.active && types.push('active');
-
- return types.map(type => this.b([type]));
+ return this.b(types);
}
},
diff --git a/packages/number-keyboard/en-US.md b/packages/number-keyboard/en-US.md
index 5aca857d5..d35338459 100644
--- a/packages/number-keyboard/en-US.md
+++ b/packages/number-keyboard/en-US.md
@@ -70,6 +70,7 @@ export default {
| z-index | Keyboard z-index | `Number` | `100` |
| extra-key | Content of bottom left key | `String` | `''` |
| close-button-text | Close button text | `String` | `-` |
+| delete-button-text | Delete button text | `String` | `delete` |
| show-delete-key | Whether to show delete button | `Boolean` | `true` |
| hide-on-click-outside | Whether to hide keyboard when click outside | `Boolean` | `true` |
diff --git a/packages/number-keyboard/index.less b/packages/number-keyboard/index.less
index e76c8620e..381d10901 100644
--- a/packages/number-keyboard/index.less
+++ b/packages/number-keyboard/index.less
@@ -73,8 +73,12 @@
line-height: @number-keyboard-key-height * 2;
}
+ &--blue,
+ &--delete {
+ font-size: 16px;
+ }
+
&--blue {
- font-size: 20px;
color: @white;
background-color: @blue;
@@ -87,14 +91,8 @@
}
}
- &--delete {
- font-size: 0;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAeCAMAAABg6AyVAAAAbFBMVEUAAAAfHiIdHB4eHR8dHR4eHB4dHB4dHR8gICIdHB4dHB4dHB4dHB8eHh8hISEeHR8fHB8fHR8fHR8fHx8eHiArKyszMzMeHB8eHB8fHR8eHiAeHh4dHB4vLjDY2Nn////b29zKysq9vb28vLzkfBRpAAAAHHRSTlMAK/PW+I/llBv77N1kSCPwWlFAOTMGBb28hHlu08g5sgAAAMlJREFUOMuV1MsWgiAQgGHQyOx+s+sgYO//jnnMGIdDDfwbN99CYEDQFiVEKkolPUG7gl9VTWC31NKuDbVz+Fc1tRJtPDmxS2BS3p5ZC+XXnnbAVoz2WEBCH7uZAalzGoa06whGiznT6sG2xgX4QO2Aej1+KN7XBKL2FvGaMtTWBhbQhtoaYzVQrHKwuGf8hhAPSF5g3xPSt45sCHcouNWx436FGA+RHyQcD35EcUj54U8ff4WYvVi1zLjelUh/OG6XjOeLWv5hfAOI+HLwwOAqhAAAAABJRU5ErkJggg==") no-repeat center center;
- background-size: auto 15px;
- }
-
&--gray {
- background-color: @background-color;
+ background-color: @number-keyboard-key-background;
}
&--active {
diff --git a/packages/number-keyboard/index.vue b/packages/number-keyboard/index.vue
index 46834fdf2..073735b64 100644
--- a/packages/number-keyboard/index.vue
+++ b/packages/number-keyboard/index.vue
@@ -27,7 +27,7 @@
/>
-
+
@@ -47,6 +47,7 @@ export default create({
show: Boolean,
title: String,
closeButtonText: String,
+ deleteButtonText: String,
theme: {
type: String,
default: 'default'
@@ -109,7 +110,7 @@ export default create({
keys.push(
{ text: this.extraKey, type: ['gray'] },
{ text: 0 },
- { text: 'delete', type: ['gray', 'delete'] }
+ { text: this.deleteText, type: ['gray', 'delete'] }
);
break;
case 'custom':
@@ -131,6 +132,10 @@ export default create({
showTitleClose() {
return this.closeButtonText && this.theme === 'default';
+ },
+
+ deleteText() {
+ return this.deleteButtonText || this.$t('delete');
}
},
@@ -165,7 +170,7 @@ export default create({
return;
}
- if (text === 'delete') {
+ if (text === this.deleteText) {
this.$emit('delete');
} else if (text === this.closeButtonText) {
this.onClose();
diff --git a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
index 0fe36c5ea..d73b55bf4 100644
--- a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
+++ b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
@@ -18,9 +18,9 @@ exports[`renders demo correctly 1`] = `
7
8
9
- .
+ .
0
- delete
+ 删除
@@ -41,12 +41,12 @@ exports[`renders demo correctly 1`] = `
7
8
9
- 0
+ 0
.
diff --git a/packages/number-keyboard/zh-CN.md b/packages/number-keyboard/zh-CN.md
index c9057e12b..b98e25116 100644
--- a/packages/number-keyboard/zh-CN.md
+++ b/packages/number-keyboard/zh-CN.md
@@ -70,6 +70,7 @@ export default {
| z-index | 键盘 z-index | `Number` | `100` | - |
| extra-key | 左下角按键内容 | `String` | `''` | - |
| close-button-text | 关闭按钮文字,空则不展示 | `String` | `-` | - |
+| delete-button-text | 删除按钮文字 | `String` | `删除` | 1.4.3 |
| show-delete-key | 是否展示删除按钮 | `Boolean` | `true` | - |
| hide-on-click-outside | 点击外部时是否收起键盘 | `Boolean` | `true` | - |
diff --git a/packages/password-input/test/__snapshots__/demo.spec.js.snap b/packages/password-input/test/__snapshots__/demo.spec.js.snap
index e2ea90000..eb045e82f 100644
--- a/packages/password-input/test/__snapshots__/demo.spec.js.snap
+++ b/packages/password-input/test/__snapshots__/demo.spec.js.snap
@@ -38,9 +38,9 @@ exports[`renders demo correctly 1`] = `
7
8
9
-
+
0
- delete
+ 删除
diff --git a/packages/style/var.less b/packages/style/var.less
index 6b2a93c43..f56d6340c 100644
--- a/packages/style/var.less
+++ b/packages/style/var.less
@@ -52,3 +52,4 @@
// number keyboard
@number-keyboard-key-height: 54px;
+@number-keyboard-key-background: #eBedf0;
\ No newline at end of file