From e933c6c6af04dd3d9f689feb37f8fb70b060e165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com> Date: Wed, 4 Dec 2024 21:48:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8DNum?= =?UTF-8?q?berKeyboard=E7=9A=84title=E6=8F=92=E6=A7=BD=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/wd-number-keyboard/wd-number-keyboard.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue index 32e1967ee..8375a594b 100644 --- a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue +++ b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue @@ -10,10 +10,9 @@ @click-modal="handleClose" > - - - {{ title }} - + + {{ title }} + {{ closeText }} From a29b8da536867e61dceffaebb2e0f583f140df6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com> Date: Wed, 4 Dec 2024 22:19:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8DNum?= =?UTF-8?q?berKeyboard=E7=9A=84title=E6=8F=92=E6=A7=BD=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/wd-number-keyboard/wd-number-keyboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue index 8375a594b..3d9f4e1bd 100644 --- a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue +++ b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue @@ -65,7 +65,7 @@ const showClose = computed(() => { }) const showTitle = computed(() => { - return props.title || showClose.value + return !!props.title }) /** From de3bbbbdd0e1273d9736a3da808afe13a32cb738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com> Date: Thu, 5 Dec 2024 10:36:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8title=E6=8F=92=E6=A7=BD?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0header=E6=8F=92=E6=A7=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/component/number-keyboard.md | 1 + .../components/wd-number-keyboard/types.ts | 8 +++++-- .../wd-number-keyboard/wd-number-keyboard.vue | 24 +++++++++++++++---- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/component/number-keyboard.md b/docs/component/number-keyboard.md index f67b33bac..ed2c0b93a 100644 --- a/docs/component/number-keyboard.md +++ b/docs/component/number-keyboard.md @@ -243,6 +243,7 @@ const onDelete = () => showToast('删除') | name | 说明 | 类型 | 最低版本 | | ----- | ---- | ---- | -------- | | title | 标题 | - | 1.2.12 | +| header | 顶部 | - | | ## Events diff --git a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/types.ts b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/types.ts index e0f016e88..2fc97074a 100644 --- a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/types.ts +++ b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/types.ts @@ -1,5 +1,5 @@ import type { PropType } from 'vue' -import { baseProps, makeBooleanProp, makeNumberProp, makeStringProp } from '../common/props' +import { baseProps, makeBooleanProp, makeNumberProp, makeStringProp, numericProp } from '../common/props' export type KeyboardMode = 'default' | 'custom' export type KeyType = '' | 'delete' | 'extra' | 'close' @@ -75,5 +75,9 @@ export const numberKeyboardProps = { /** * 额外按键 */ - extraKey: [String, Array] as PropType> + extraKey: [String, Array] as PropType>, + /** + * 背景圆角大小,默认单位为px + */ + radius: numericProp } diff --git a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue index 3d9f4e1bd..9e9813441 100644 --- a/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue +++ b/src/uni_modules/wot-design-uni/components/wd-number-keyboard/wd-number-keyboard.vue @@ -5,14 +5,17 @@ :z-index="zIndex" :safe-area-inset-bottom="safeAreaInsetBottom" :modal-style="modal ? '' : 'opacity: 0;'" + :custom-style="rootStyle" :modal="hideOnClickOutside" :lockScroll="lockScroll" @click-modal="handleClose" > - - {{ title }} - + + + + {{ title }} + {{ closeText }} @@ -42,10 +45,11 @@ export default {