diff --git a/src/number-keyboard/README.md b/src/number-keyboard/README.md index df750a9ff..db8102105 100644 --- a/src/number-keyboard/README.md +++ b/src/number-keyboard/README.md @@ -125,5 +125,6 @@ export default { | Name | Description | |------|------| -| delete | Custom delete button content | +| delete | Custom delete key content | +| extra-key | Custom extra key content | | title-left | Custom title left content | diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md index 6c864a70e..8e3b6bf38 100644 --- a/src/number-keyboard/README.zh-CN.md +++ b/src/number-keyboard/README.zh-CN.md @@ -131,5 +131,6 @@ export default { | 名称 | 说明 | |------|------| -| delete | 自定义删除按钮内容 | +| delete | 自定义删除按键内容 | +| extra-key | 自定义左下角按键内容 | title-left | 自定义标题栏左侧内容 | diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js index 97e33a44e..851280672 100644 --- a/src/number-keyboard/index.js +++ b/src/number-keyboard/index.js @@ -82,13 +82,16 @@ export default createComponent({ switch (this.theme) { case 'default': keys.push( - { text: this.extraKey, theme: ['gray'] }, + { text: this.extraKey, theme: ['gray'], type: 'extra' }, { text: 0 }, { text: this.deleteText, theme: ['gray'], type: 'delete' } ); break; case 'custom': - keys.push({ text: 0, theme: ['middle'] }, { text: this.extraKey }); + keys.push( + { text: 0, theme: ['middle'] }, + { text: this.extraKey, type: 'extra' } + ); break; } @@ -161,6 +164,7 @@ export default createComponent({ onPress={onPress} > {key.type === 'delete' && this.slots('delete')} + {key.type === 'extra' && this.slots('extra-key')} )); diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap index 314a8ed75..9f688b807 100644 --- a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap @@ -5,12 +5,12 @@ exports[`renders demo correctly 1`] = `
完成
-
123456789.0删除
+
123456789.0删除
diff --git a/src/number-keyboard/test/__snapshots__/index.spec.js.snap b/src/number-keyboard/test/__snapshots__/index.spec.js.snap index c6f4f0397..32df57937 100644 --- a/src/number-keyboard/test/__snapshots__/index.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/index.spec.js.snap @@ -1,45 +1,51 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`extra-key slot 1`] = ` + +`; + exports[`focus on key 1`] = ` `; exports[`focus on key 2`] = ` `; exports[`move and blur key 1`] = ` `; exports[`move and blur key 2`] = ` `; exports[`move and blur key 3`] = ` `; exports[`render title 1`] = ` `; exports[`title-left slot 1`] = ` `; diff --git a/src/number-keyboard/test/index.spec.js b/src/number-keyboard/test/index.spec.js index 25921bad4..ca78a5f11 100644 --- a/src/number-keyboard/test/index.spec.js +++ b/src/number-keyboard/test/index.spec.js @@ -88,6 +88,16 @@ test('title-left slot', () => { expect(wrapper).toMatchSnapshot(); }); +test('extra-key slot', () => { + const wrapper = mount(NumberKeyboard, { + scopedSlots: { + 'extra-key': () => 'Custom Extra Key' + } + }); + + expect(wrapper).toMatchSnapshot(); +}); + test('hideOnClickOutside', () => { const wrapper = mount(NumberKeyboard, { propsData: { diff --git a/src/password-input/README.zh-CN.md b/src/password-input/README.zh-CN.md index 20a0b6685..e4728cd07 100644 --- a/src/password-input/README.zh-CN.md +++ b/src/password-input/README.zh-CN.md @@ -78,6 +78,8 @@ export default { /> ``` +## API + ### Props | 参数 | 说明 | 类型 | 默认值 | 版本 | diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index 9448a5450..46cc5c6da 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -17,7 +17,7 @@ exports[`renders demo correctly 1`] = `
密码为 6 位数字
-
1234567890删除
+
1234567890删除