From 95c4b820ab45a6a606b673b12136128cc97d6144 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 6 Sep 2024 15:18:01 +0800
Subject: [PATCH 1/2] feat: demos for popup & dialog

---
 src/packages/popup/demos/h5/demo7.tsx   | 33 ++++++++++++++++++++-
 src/packages/popup/demos/taro/demo7.tsx | 38 ++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/packages/popup/demos/h5/demo7.tsx b/src/packages/popup/demos/h5/demo7.tsx
index 6ad34405fb..c5c9e5a0e3 100644
--- a/src/packages/popup/demos/h5/demo7.tsx
+++ b/src/packages/popup/demos/h5/demo7.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react'
-import { Popup, Cell } from '@nutui/nutui-react'
+import { Popup, Cell, Dialog } from '@nutui/nutui-react'
 
 const Demo6 = () => {
   const [showMutiple, setShowMutiple] = useState(false)
   const [showMutipleInner, setShowMutipleInner] = useState(false)
+  const [showDialog, setShowDialog] = useState(false)
 
   return (
     <>
@@ -44,6 +45,36 @@ const Demo6 = () => {
           close
         </span>
       </Popup>
+
+      <Cell
+        title="PopUp + Dialog"
+        onClick={() => {
+          setShowDialog(true)
+        }}
+      />
+
+      <Popup
+        closeable
+        visible={showDialog}
+        style={{ height: '100%' }}
+        position="bottom"
+        onClose={() => {
+          setShowDialog(false)
+        }}
+      >
+        <Cell
+          title="打开 Dialog"
+          style={{ margin: '20% 20px', width: '80%' }}
+          onClick={() =>
+            Dialog.alert({
+              title: '提示',
+              content: '支持函数调用和组件调用两种方式。',
+              hideCancelButton: true,
+              confirmText: '确认',
+            })
+          }
+        />
+      </Popup>
     </>
   )
 }
diff --git a/src/packages/popup/demos/taro/demo7.tsx b/src/packages/popup/demos/taro/demo7.tsx
index dd36b792d8..f394872ae0 100644
--- a/src/packages/popup/demos/taro/demo7.tsx
+++ b/src/packages/popup/demos/taro/demo7.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react'
-import { Popup, Cell } from '@nutui/nutui-react-taro'
+import { Popup, Cell, Dialog } from '@nutui/nutui-react-taro'
 
 const Demo6 = () => {
   const [showMutiple, setShowMutiple] = useState(false)
   const [showMutipleInner, setShowMutipleInner] = useState(false)
+  const [showDialog, setShowDialog] = useState(false)
 
   return (
     <>
@@ -13,6 +14,7 @@ const Demo6 = () => {
           setShowMutiple(true)
         }}
       />
+
       <Popup
         visible={showMutiple}
         style={{ padding: '30px 50px' }}
@@ -44,6 +46,40 @@ const Demo6 = () => {
           close
         </span>
       </Popup>
+
+      <Cell
+        title="PopUp + Dialog"
+        onClick={() => {
+          setShowDialog(true)
+        }}
+      />
+
+      <Popup
+        closeable
+        visible={showDialog}
+        style={{ height: '100%' }}
+        position="bottom"
+        onClose={() => {
+          setShowDialog(false)
+        }}
+      >
+        <Cell
+          title="打开 Dialog"
+          style={{ margin: '20% 20px', width: '80%' }}
+          onClick={() =>
+            Dialog.open('test', {
+              title: 'Dialog',
+              content: '可通过 Dialog.open 打开对话框',
+              onConfirm: () => {
+                Dialog.close('test')
+              },
+              onCancel: () => {
+                Dialog.close('test')
+              },
+            })
+          }
+        />
+      </Popup>
     </>
   )
 }

From dd2c803c22c32e698cff2e5245f2a2ce0d884cea Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Fri, 6 Sep 2024 15:35:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20demo=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/popup/demos/h5/demo5.tsx   | 4 ++--
 src/packages/popup/demos/h5/demo6.tsx   | 4 ++--
 src/packages/popup/demos/h5/demo7.tsx   | 4 ++--
 src/packages/popup/demos/taro/demo5.tsx | 4 ++--
 src/packages/popup/demos/taro/demo6.tsx | 4 ++--
 src/packages/popup/demos/taro/demo7.tsx | 4 ++--
 src/packages/popup/demos/taro/demo8.tsx | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/packages/popup/demos/h5/demo5.tsx b/src/packages/popup/demos/h5/demo5.tsx
index 1547e898ae..338b7d2927 100644
--- a/src/packages/popup/demos/h5/demo5.tsx
+++ b/src/packages/popup/demos/h5/demo5.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell } from '@nutui/nutui-react'
 
-const Demo4 = () => {
+const Demo5 = () => {
   const [showBottomRound, setShowBottomRound] = useState(false)
 
   return (
@@ -24,4 +24,4 @@ const Demo4 = () => {
     </>
   )
 }
-export default Demo4
+export default Demo5
diff --git a/src/packages/popup/demos/h5/demo6.tsx b/src/packages/popup/demos/h5/demo6.tsx
index 175e861647..09c573712b 100644
--- a/src/packages/popup/demos/h5/demo6.tsx
+++ b/src/packages/popup/demos/h5/demo6.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell } from '@nutui/nutui-react'
 
-const Demo5 = () => {
+const Demo6 = () => {
   const [showMountNode, setShowMountNode] = useState(false)
 
   return (
@@ -25,4 +25,4 @@ const Demo5 = () => {
     </>
   )
 }
-export default Demo5
+export default Demo6
diff --git a/src/packages/popup/demos/h5/demo7.tsx b/src/packages/popup/demos/h5/demo7.tsx
index c5c9e5a0e3..a48827c66c 100644
--- a/src/packages/popup/demos/h5/demo7.tsx
+++ b/src/packages/popup/demos/h5/demo7.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell, Dialog } from '@nutui/nutui-react'
 
-const Demo6 = () => {
+const Demo7 = () => {
   const [showMutiple, setShowMutiple] = useState(false)
   const [showMutipleInner, setShowMutipleInner] = useState(false)
   const [showDialog, setShowDialog] = useState(false)
@@ -78,4 +78,4 @@ const Demo6 = () => {
     </>
   )
 }
-export default Demo6
+export default Demo7
diff --git a/src/packages/popup/demos/taro/demo5.tsx b/src/packages/popup/demos/taro/demo5.tsx
index 8073c464ed..ef25d7c0e3 100644
--- a/src/packages/popup/demos/taro/demo5.tsx
+++ b/src/packages/popup/demos/taro/demo5.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell } from '@nutui/nutui-react-taro'
 
-const Demo4 = () => {
+const Demo5 = () => {
   const [showBottomRound, setShowBottomRound] = useState(false)
 
   return (
@@ -24,4 +24,4 @@ const Demo4 = () => {
     </>
   )
 }
-export default Demo4
+export default Demo5
diff --git a/src/packages/popup/demos/taro/demo6.tsx b/src/packages/popup/demos/taro/demo6.tsx
index 1d58647cce..e1358d7029 100644
--- a/src/packages/popup/demos/taro/demo6.tsx
+++ b/src/packages/popup/demos/taro/demo6.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell } from '@nutui/nutui-react-taro'
 
-const Demo5 = () => {
+const Demo6 = () => {
   const [showMountNode, setShowMountNode] = useState(false)
 
   return (
@@ -25,4 +25,4 @@ const Demo5 = () => {
     </>
   )
 }
-export default Demo5
+export default Demo6
diff --git a/src/packages/popup/demos/taro/demo7.tsx b/src/packages/popup/demos/taro/demo7.tsx
index f394872ae0..eec696c47b 100644
--- a/src/packages/popup/demos/taro/demo7.tsx
+++ b/src/packages/popup/demos/taro/demo7.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Popup, Cell, Dialog } from '@nutui/nutui-react-taro'
 
-const Demo6 = () => {
+const Demo7 = () => {
   const [showMutiple, setShowMutiple] = useState(false)
   const [showMutipleInner, setShowMutipleInner] = useState(false)
   const [showDialog, setShowDialog] = useState(false)
@@ -83,4 +83,4 @@ const Demo6 = () => {
     </>
   )
 }
-export default Demo6
+export default Demo7
diff --git a/src/packages/popup/demos/taro/demo8.tsx b/src/packages/popup/demos/taro/demo8.tsx
index 5b8aa04f6a..38d6895dcb 100644
--- a/src/packages/popup/demos/taro/demo8.tsx
+++ b/src/packages/popup/demos/taro/demo8.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
 import { Popup, Cell } from '@nutui/nutui-react-taro'
 import { ScrollView } from '@tarojs/components'
 
-const Demo6 = () => {
+const Demo8 = () => {
   const [scrollPenetration, setScrollPenetration] = useState(false)
 
   return (
@@ -25,4 +25,4 @@ const Demo6 = () => {
     </>
   )
 }
-export default Demo6
+export default Demo8