From a19d6808edffea2385aa25ebdf13fddff31fced0 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 22 Nov 2024 14:30:42 +0800 Subject: [PATCH 1/2] feat(Dialog): dialog harmony adaptation --- packages/nutui-taro-demo/src/app.config.ts | 104 ++------------------- src/config.json | 2 +- src/packages/dialog/demos/h5/demo6.tsx | 2 + src/packages/dialog/demos/taro/demo6.tsx | 2 + src/packages/dialog/demos/taro/demo7.tsx | 37 ++++---- src/packages/dialog/dialog.scss | 17 ++-- 6 files changed, 41 insertions(+), 123 deletions(-) diff --git a/packages/nutui-taro-demo/src/app.config.ts b/packages/nutui-taro-demo/src/app.config.ts index 7357a2dbf7..824fa303a2 100644 --- a/packages/nutui-taro-demo/src/app.config.ts +++ b/packages/nutui-taro-demo/src/app.config.ts @@ -2,125 +2,37 @@ const subPackages = [ { "root": "base", - "pages": [ - "pages/button/index", - "pages/cell/index", - "pages/configprovider/index", - "pages/icon/index", - "pages/image/index", - "pages/overlay/index" - ] + "pages": [] }, { "root": "layout", - "pages": [ - "pages/divider/index", - "pages/grid/index", - "pages/layout/index", - "pages/safearea/index", - "pages/space/index", - "pages/sticky/index" - ] + "pages": [] }, { "root": "nav", - "pages": [ - "pages/backtop/index", - "pages/elevator/index", - "pages/fixednav/index", - "pages/hoverbutton/index", - "pages/navbar/index", - "pages/sidenavbar/index", - "pages/tabbar/index", - "pages/tabs/index" - ] + "pages": [] }, { "root": "dentry", - "pages": [ - "pages/address/index", - "pages/calendar/index", - "pages/calendarcard/index", - "pages/cascader/index", - "pages/checkbox/index", - "pages/datepicker/index", - "pages/form/index", - "pages/input/index", - "pages/inputnumber/index" - ] + "pages": [] }, { "root": "dataentry", - "pages": [ - "pages/menu/index", - "pages/numberkeyboard/index", - "pages/picker/index", - "pages/radio/index", - "pages/range/index", - "pages/rate/index", - "pages/searchbar/index", - "pages/shortpassword/index", - "pages/signature/index", - "pages/switch/index", - "pages/textarea/index", - "pages/uploader/index" - ] + "pages": [] }, { "root": "feedback", "pages": [ - "pages/actionsheet/index", - "pages/badge/index", - "pages/dialog/index", - "pages/drag/index", - "pages/empty/index", - "pages/infiniteloading/index", - "pages/loading/index", - "pages/noticebar/index", - "pages/notify/index", - "pages/popover/index", - "pages/popup/index", - "pages/pulltorefresh/index", - "pages/resultpage/index", - "pages/skeleton/index", - "pages/swipe/index", - "pages/toast/index" + "pages/dialog/index" ] }, { "root": "exhibition", - "pages": [ - "pages/animate/index", - "pages/animatingnumbers/index", - "pages/avatar/index", - "pages/circleprogress/index", - "pages/collapse/index", - "pages/countdown/index", - "pages/ellipsis/index", - "pages/imagepreview/index", - "pages/indicator/index", - "pages/pagination/index", - "pages/price/index", - "pages/progress/index", - "pages/steps/index", - "pages/swiper/index", - "pages/table/index", - "pages/tag/index", - "pages/tour/index", - "pages/video/index", - "pages/virtuallist/index" - ] + "pages": [] }, { "root": "business", - "pages": [ - "pages/avatarcropper/index", - "pages/barrage/index", - "pages/card/index", - "pages/timeselect/index", - "pages/trendarrow/index", - "pages/watermark/index" - ] + "pages": [] } ]; diff --git a/src/config.json b/src/config.json index 25f5c94798..51872b8a2d 100644 --- a/src/config.json +++ b/src/config.json @@ -727,7 +727,7 @@ "author": "lzz" }, { - "version": "2.0.0", + "version": "3.0.0", "name": "Dialog", "type": "component", "cName": "对话框", diff --git a/src/packages/dialog/demos/h5/demo6.tsx b/src/packages/dialog/demos/h5/demo6.tsx index 50b45ed4b7..eab3112d47 100644 --- a/src/packages/dialog/demos/h5/demo6.tsx +++ b/src/packages/dialog/demos/h5/demo6.tsx @@ -36,6 +36,8 @@ const Demo6 = () => { className="test-dialog" title="底部带关闭按钮" visible={visible2} + confirmText="决策1" + cancelText="决策2" onConfirm={() => setVisible2(false)} onCancel={() => setVisible2(false)} closeIcon diff --git a/src/packages/dialog/demos/taro/demo6.tsx b/src/packages/dialog/demos/taro/demo6.tsx index 54d2937d81..73b46d2f9e 100644 --- a/src/packages/dialog/demos/taro/demo6.tsx +++ b/src/packages/dialog/demos/taro/demo6.tsx @@ -36,6 +36,8 @@ const Demo6 = () => { className="test-dialog" title="底部带关闭按钮" visible={visible2} + confirmText="决策1" + cancelText="决策2" onConfirm={() => setVisible2(false)} onCancel={() => setVisible2(false)} closeIcon diff --git a/src/packages/dialog/demos/taro/demo7.tsx b/src/packages/dialog/demos/taro/demo7.tsx index 328799b9f6..62f837102b 100644 --- a/src/packages/dialog/demos/taro/demo7.tsx +++ b/src/packages/dialog/demos/taro/demo7.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react' import { Cell, Dialog } from '@nutui/nutui-react-taro' +import { View } from '@tarojs/components' const Demo7 = () => { const [visible, setVisible] = useState(false) @@ -18,25 +19,23 @@ const Demo7 = () => { onConfirm={() => setVisible(false)} onCancel={() => setVisible(false)} > - <> -
- 文字内容文字内容文字内容文字内容文字内容文字内容文字内容文字内容 -
-
- 自定义内容区域 -
- + + 文字内容文字内容文字内容文字内容文字内容文字内容文字内容文字内容 + + + 自定义内容区域 + ) diff --git a/src/packages/dialog/dialog.scss b/src/packages/dialog/dialog.scss index da4d81c760..1cb463ebaf 100644 --- a/src/packages/dialog/dialog.scss +++ b/src/packages/dialog/dialog.scss @@ -7,7 +7,7 @@ flex-direction: column; align-items: center; width: $dialog-width; - max-height: 67%; + // max-height: 67%; min-height: $dialog-min-height; padding: $dialog-padding; box-sizing: border-box; @@ -42,27 +42,30 @@ display: flex; justify-content: center; align-items: center; - top: $dialog-close-top; color: $dialog-close-color; .nut-icon { - font-size: 24px; - height: 24px; - width: 24px; + font-size: $dialog-close-width; + width: $dialog-close-width; + height: $dialog-close-height; } &-top-right { + top: $dialog-close-top; right: $dialog-close-right; } &-top-left { + top: $dialog-close-top; left: $dialog-close-left; } &-bottom { - top: initial; bottom: -56px; left: 50%; - transform: translate(-50%); + transform: translateY(-50%); + .nut-icon { + color: $dialog-close-color; + } } &:active { From 55ba09db5fcc7db1f3d037866e29f077af5cb8d1 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 22 Nov 2024 14:33:35 +0800 Subject: [PATCH 2/2] feat(Dialog): dialog harmony adaptation --- packages/nutui-taro-demo/src/app.config.ts | 104 +++++++++++++++++++-- 1 file changed, 96 insertions(+), 8 deletions(-) diff --git a/packages/nutui-taro-demo/src/app.config.ts b/packages/nutui-taro-demo/src/app.config.ts index 824fa303a2..7357a2dbf7 100644 --- a/packages/nutui-taro-demo/src/app.config.ts +++ b/packages/nutui-taro-demo/src/app.config.ts @@ -2,37 +2,125 @@ const subPackages = [ { "root": "base", - "pages": [] + "pages": [ + "pages/button/index", + "pages/cell/index", + "pages/configprovider/index", + "pages/icon/index", + "pages/image/index", + "pages/overlay/index" + ] }, { "root": "layout", - "pages": [] + "pages": [ + "pages/divider/index", + "pages/grid/index", + "pages/layout/index", + "pages/safearea/index", + "pages/space/index", + "pages/sticky/index" + ] }, { "root": "nav", - "pages": [] + "pages": [ + "pages/backtop/index", + "pages/elevator/index", + "pages/fixednav/index", + "pages/hoverbutton/index", + "pages/navbar/index", + "pages/sidenavbar/index", + "pages/tabbar/index", + "pages/tabs/index" + ] }, { "root": "dentry", - "pages": [] + "pages": [ + "pages/address/index", + "pages/calendar/index", + "pages/calendarcard/index", + "pages/cascader/index", + "pages/checkbox/index", + "pages/datepicker/index", + "pages/form/index", + "pages/input/index", + "pages/inputnumber/index" + ] }, { "root": "dataentry", - "pages": [] + "pages": [ + "pages/menu/index", + "pages/numberkeyboard/index", + "pages/picker/index", + "pages/radio/index", + "pages/range/index", + "pages/rate/index", + "pages/searchbar/index", + "pages/shortpassword/index", + "pages/signature/index", + "pages/switch/index", + "pages/textarea/index", + "pages/uploader/index" + ] }, { "root": "feedback", "pages": [ - "pages/dialog/index" + "pages/actionsheet/index", + "pages/badge/index", + "pages/dialog/index", + "pages/drag/index", + "pages/empty/index", + "pages/infiniteloading/index", + "pages/loading/index", + "pages/noticebar/index", + "pages/notify/index", + "pages/popover/index", + "pages/popup/index", + "pages/pulltorefresh/index", + "pages/resultpage/index", + "pages/skeleton/index", + "pages/swipe/index", + "pages/toast/index" ] }, { "root": "exhibition", - "pages": [] + "pages": [ + "pages/animate/index", + "pages/animatingnumbers/index", + "pages/avatar/index", + "pages/circleprogress/index", + "pages/collapse/index", + "pages/countdown/index", + "pages/ellipsis/index", + "pages/imagepreview/index", + "pages/indicator/index", + "pages/pagination/index", + "pages/price/index", + "pages/progress/index", + "pages/steps/index", + "pages/swiper/index", + "pages/table/index", + "pages/tag/index", + "pages/tour/index", + "pages/video/index", + "pages/virtuallist/index" + ] }, { "root": "business", - "pages": [] + "pages": [ + "pages/avatarcropper/index", + "pages/barrage/index", + "pages/card/index", + "pages/timeselect/index", + "pages/trendarrow/index", + "pages/watermark/index" + ] } ];