From abac235166477b033acae28017166d075ea36854 Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 25 Feb 2025 12:33:43 +0800 Subject: [PATCH 1/4] feat: harmony --- src/config.json | 4 ++-- src/packages/overlay/overlay.taro.tsx | 2 +- src/packages/shortpassword/shortpassword.scss | 10 ++++++++++ src/packages/shortpassword/shortpassword.taro.tsx | 11 ++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/config.json b/src/config.json index 70976e92f3..fdbec3933e 100644 --- a/src/config.json +++ b/src/config.json @@ -170,7 +170,7 @@ "name": "布局组件", "enName": "layout", "packages": [ - + { "version": "3.0.0", "name": "Divider", @@ -777,7 +777,7 @@ "show": true, "taro": true, "author": "Drjingfubo", - "dd": false + "dd": true }, { "version": "2.0.0", diff --git a/src/packages/overlay/overlay.taro.tsx b/src/packages/overlay/overlay.taro.tsx index 51b3b88481..7964022d9a 100644 --- a/src/packages/overlay/overlay.taro.tsx +++ b/src/packages/overlay/overlay.taro.tsx @@ -47,7 +47,7 @@ export const Overlay: FunctionComponent< const classes = classNames(classPrefix, className) const styles = { ...style, - zIndex, + // zIndex, } const handleClick = (e: ITouchEvent) => { diff --git a/src/packages/shortpassword/shortpassword.scss b/src/packages/shortpassword/shortpassword.scss index 375c9a4cec..82c52168cb 100644 --- a/src/packages/shortpassword/shortpassword.scss +++ b/src/packages/shortpassword/shortpassword.scss @@ -1,13 +1,23 @@ @import '../popup/popup.scss'; .nut-shortpassword { + &-popup { + padding: 32px 24px 28px 24px; + borderradius: 12px; + textalign: center; + } + &-title { + display: flex; + justify-content: center; line-height: 1; font-size: $font-size-l; color: $color-title; } &-description { + display: flex; + justify-content: center; margin-top: 12px; margin-bottom: 24px; line-height: 1; diff --git a/src/packages/shortpassword/shortpassword.taro.tsx b/src/packages/shortpassword/shortpassword.taro.tsx index 9f9cc84087..eaef2610cb 100644 --- a/src/packages/shortpassword/shortpassword.taro.tsx +++ b/src/packages/shortpassword/shortpassword.taro.tsx @@ -37,6 +37,7 @@ export interface ShortPasswordProps extends PopupProps { const defaultProps = { ...ComponentDefaults, value: '', + zIndex: 1002, visible: false, plain: false, hideFooter: true, @@ -62,6 +63,8 @@ export const InternalShortPassword: ForwardRefRenderFunction< className, closeable, autoFocus, + zIndex, + round, onFocus, onChange, onConfirm, @@ -122,15 +125,13 @@ export const InternalShortPassword: ForwardRefRenderFunction< return ( From f48496a5db9d0b30d28252b2c813a684d73851c4 Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 4 Mar 2025 19:38:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=20zindex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/shortpassword/shortpassword.taro.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/packages/shortpassword/shortpassword.taro.tsx b/src/packages/shortpassword/shortpassword.taro.tsx index eaef2610cb..5bfc6d8bcc 100644 --- a/src/packages/shortpassword/shortpassword.taro.tsx +++ b/src/packages/shortpassword/shortpassword.taro.tsx @@ -37,7 +37,6 @@ export interface ShortPasswordProps extends PopupProps { const defaultProps = { ...ComponentDefaults, value: '', - zIndex: 1002, visible: false, plain: false, hideFooter: true, @@ -63,7 +62,6 @@ export const InternalShortPassword: ForwardRefRenderFunction< className, closeable, autoFocus, - zIndex, round, onFocus, onChange, @@ -130,7 +128,6 @@ export const InternalShortPassword: ForwardRefRenderFunction< closeable onOverlayClick={onClose} onCloseIconClick={onClose} - zIndex={zIndex} round {...rest} > From 52ac7efbdf65f9d1db2a899491cd5336d2e9b7bc Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 5 Mar 2025 09:46:04 +0800 Subject: [PATCH 3/4] fix: review --- src/packages/shortpassword/shortpassword.scss | 4 ++-- src/packages/shortpassword/shortpassword.tsx | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/packages/shortpassword/shortpassword.scss b/src/packages/shortpassword/shortpassword.scss index 82c52168cb..c2cbeb997d 100644 --- a/src/packages/shortpassword/shortpassword.scss +++ b/src/packages/shortpassword/shortpassword.scss @@ -3,8 +3,8 @@ .nut-shortpassword { &-popup { padding: 32px 24px 28px 24px; - borderradius: 12px; - textalign: center; + border-radius: 12px; + text-align: center; } &-title { diff --git a/src/packages/shortpassword/shortpassword.tsx b/src/packages/shortpassword/shortpassword.tsx index c72c2cf113..1d1d1c9667 100644 --- a/src/packages/shortpassword/shortpassword.tsx +++ b/src/packages/shortpassword/shortpassword.tsx @@ -61,6 +61,7 @@ export const InternalShortPassword: ForwardRefRenderFunction< className, closeable, autoFocus, + round, onFocus, onChange, onConfirm, @@ -121,15 +122,12 @@ export const InternalShortPassword: ForwardRefRenderFunction< return (
From 7a477b8457cea417a27b380a27db3036b4b862ed Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 5 Mar 2025 12:25:19 +0800 Subject: [PATCH 4/4] fix: review --- src/packages/shortpassword/shortpassword.taro.tsx | 2 +- src/packages/shortpassword/shortpassword.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/shortpassword/shortpassword.taro.tsx b/src/packages/shortpassword/shortpassword.taro.tsx index 5bfc6d8bcc..5fcffbf24b 100644 --- a/src/packages/shortpassword/shortpassword.taro.tsx +++ b/src/packages/shortpassword/shortpassword.taro.tsx @@ -128,7 +128,7 @@ export const InternalShortPassword: ForwardRefRenderFunction< closeable onOverlayClick={onClose} onCloseIconClick={onClose} - round + round={round} {...rest} > diff --git a/src/packages/shortpassword/shortpassword.tsx b/src/packages/shortpassword/shortpassword.tsx index 1d1d1c9667..c236536943 100644 --- a/src/packages/shortpassword/shortpassword.tsx +++ b/src/packages/shortpassword/shortpassword.tsx @@ -127,7 +127,7 @@ export const InternalShortPassword: ForwardRefRenderFunction< closeable onOverlayClick={handleClose} onCloseIconClick={handleClose} - round + round={round} {...rest} >