From 5a9596aea5a4c80e06f0d5754a62766caea5e67b Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 22 Mar 2024 18:29:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(dialog):=20=E5=85=B3=E9=97=AD=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=BB=98=E8=AE=A4=E5=9C=A8=E5=BA=95=E9=83=A8=EF=BC=8C?= =?UTF-8?q?24px=E7=99=BD=E8=89=B2=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/dialog/demos/h5/demo6.tsx | 11 +++++------ src/packages/dialog/demos/taro/demo6.tsx | 11 +++++------ src/packages/dialog/dialog.taro.tsx | 4 ++-- src/packages/dialog/dialog.tsx | 8 ++++++-- src/styles/variables-jmapp.scss | 2 +- src/styles/variables.scss | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/packages/dialog/demos/h5/demo6.tsx b/src/packages/dialog/demos/h5/demo6.tsx index 32fe42b659..b79ddad282 100644 --- a/src/packages/dialog/demos/h5/demo6.tsx +++ b/src/packages/dialog/demos/h5/demo6.tsx @@ -1,6 +1,5 @@ import React, { useState } from 'react' import { Cell, Dialog } from '@nutui/nutui-react' -import { Close } from '@nutui/icons-react' const Demo6 = () => { const [visible1, setVisible1] = useState(false) @@ -18,6 +17,10 @@ const Demo6 = () => { title="顶部带关闭按钮" visible={visible1} closeIcon + closeIconPosition="top-right" + style={{ + '--nutui-dialog-close-color': '#8c8c8c', + }} onConfirm={() => setVisible1(false)} onCancel={() => setVisible1(false)} > @@ -33,13 +36,9 @@ const Demo6 = () => { className="test-dialog" title="底部带关闭按钮" visible={visible2} - closeIcon={} - closeIconPosition="bottom" onConfirm={() => setVisible2(false)} onCancel={() => setVisible2(false)} - style={{ - '--nutui-dialog-close-color': '#FFFFFF', - }} + closeIcon > 支持函数调用和组件调用两种方式。 diff --git a/src/packages/dialog/demos/taro/demo6.tsx b/src/packages/dialog/demos/taro/demo6.tsx index f7f86b7749..56ef910047 100644 --- a/src/packages/dialog/demos/taro/demo6.tsx +++ b/src/packages/dialog/demos/taro/demo6.tsx @@ -1,6 +1,5 @@ import React, { useState } from 'react' import { Cell, Dialog } from '@nutui/nutui-react-taro' -import { Close } from '@nutui/icons-react-taro' const Demo6 = () => { const [visible1, setVisible1] = useState(false) @@ -18,6 +17,10 @@ const Demo6 = () => { title="顶部带关闭按钮" visible={visible1} closeIcon + closeIconPosition="top-right" + style={{ + '--nutui-dialog-close-color': '#8c8c8c', + }} onConfirm={() => setVisible1(false)} onCancel={() => setVisible1(false)} > @@ -33,13 +36,9 @@ const Demo6 = () => { className="test-dialog" title="底部带关闭按钮" visible={visible2} - closeIcon={} - closeIconPosition="bottom" onConfirm={() => setVisible2(false)} onCancel={() => setVisible2(false)} - style={{ - '--nutui-dialog-close-color': '#FFFFFF', - }} + closeIcon > 支持函数调用和组件调用两种方式。 diff --git a/src/packages/dialog/dialog.taro.tsx b/src/packages/dialog/dialog.taro.tsx index 8f24b050a0..4ac3fa82a8 100644 --- a/src/packages/dialog/dialog.taro.tsx +++ b/src/packages/dialog/dialog.taro.tsx @@ -33,7 +33,7 @@ const defaultProps = { disableConfirmButton: false, footerDirection: 'horizontal', lockScroll: true, - closeIconPosition: 'top-right', + closeIconPosition: 'bottom', closeIcon: false, beforeCancel: () => true, beforeClose: () => true, @@ -158,7 +158,7 @@ export const BaseDialog: FunctionComponent> & { }) return ( - {React.isValidElement(closeIcon) ? closeIcon : } + {React.isValidElement(closeIcon) ? closeIcon : } ) } diff --git a/src/packages/dialog/dialog.tsx b/src/packages/dialog/dialog.tsx index 54972e663c..8e7feecd1b 100644 --- a/src/packages/dialog/dialog.tsx +++ b/src/packages/dialog/dialog.tsx @@ -26,7 +26,7 @@ const defaultProps = { disableConfirmButton: false, footerDirection: 'horizontal', lockScroll: true, - closeIconPosition: 'top-right', + closeIconPosition: 'bottom', closeIcon: false, beforeCancel: () => true, beforeClose: () => true, @@ -126,7 +126,11 @@ const BaseDialog: ForwardRefRenderFunction> = ( }) return (
- {React.isValidElement(closeIcon) ? closeIcon : } + {React.isValidElement(closeIcon) ? ( + closeIcon + ) : ( + + )}
) } diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss index 81d2709a3e..000855cf32 100644 --- a/src/styles/variables-jmapp.scss +++ b/src/styles/variables-jmapp.scss @@ -1323,7 +1323,7 @@ $dialog-vertical-footer-ok-margin-top: var( --nutui-dialog-vertical-footer-ok-margin-top, 5px ) !default; -$dialog-close-color: var(--nutui-dialog-close-color, #8c8c8c) !default; +$dialog-close-color: var(--nutui-dialog-close-color, #ffffff) !default; $dialog-close-width: var(--nutui-dialog-close-width, 18px) !default; $dialog-close-height: var(--nutui-dialog-close-height, 18px) !default; $dialog-close-top: var(--nutui-dialog-close-top, 16px) !default; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 40cc0226be..43e3d69154 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1276,7 +1276,7 @@ $dialog-vertical-footer-ok-margin-top: var( --nutui-dialog-vertical-footer-ok-margin-top, 5px ) !default; -$dialog-close-color: var(--nutui-dialog-close-color, #8c8c8c) !default; +$dialog-close-color: var(--nutui-dialog-close-color, #ffffff) !default; $dialog-close-width: var(--nutui-dialog-close-width, 18px) !default; $dialog-close-height: var(--nutui-dialog-close-height, 18px) !default; $dialog-close-top: var(--nutui-dialog-close-top, 16px) !default; From 8b40cce3ba70efcc009dd8cd20a045ee8003a70b Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 22 Mar 2024 19:10:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=BB=98=E8=AE=A4=E5=B0=BA=E5=AF=B8=E6=98=AF?= =?UTF-8?q?24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/dialog/dialog.scss | 5 +++++ src/packages/dialog/dialog.taro.tsx | 2 +- src/packages/dialog/dialog.tsx | 6 +----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/packages/dialog/dialog.scss b/src/packages/dialog/dialog.scss index d1d53d44af..da4d81c760 100644 --- a/src/packages/dialog/dialog.scss +++ b/src/packages/dialog/dialog.scss @@ -44,6 +44,11 @@ align-items: center; top: $dialog-close-top; color: $dialog-close-color; + .nut-icon { + font-size: 24px; + height: 24px; + width: 24px; + } &-top-right { right: $dialog-close-right; diff --git a/src/packages/dialog/dialog.taro.tsx b/src/packages/dialog/dialog.taro.tsx index 4ac3fa82a8..24776cbfc1 100644 --- a/src/packages/dialog/dialog.taro.tsx +++ b/src/packages/dialog/dialog.taro.tsx @@ -158,7 +158,7 @@ export const BaseDialog: FunctionComponent> & { }) return ( - {React.isValidElement(closeIcon) ? closeIcon : } + {React.isValidElement(closeIcon) ? closeIcon : } ) } diff --git a/src/packages/dialog/dialog.tsx b/src/packages/dialog/dialog.tsx index 8e7feecd1b..9ec4a62ede 100644 --- a/src/packages/dialog/dialog.tsx +++ b/src/packages/dialog/dialog.tsx @@ -126,11 +126,7 @@ const BaseDialog: ForwardRefRenderFunction> = ( }) return (
- {React.isValidElement(closeIcon) ? ( - closeIcon - ) : ( - - )} + {React.isValidElement(closeIcon) ? closeIcon : }
) }