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 {