From 398b4d512cf98ae68133b424ca722053b05733e1 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 28 Feb 2025 18:57:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20dialog=20=E5=9C=A8=E9=B8=BF=E8=92=99?=
 =?UTF-8?q?=E4=B8=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/dialog/dialog.scss     |   7 +-
 src/packages/dialog/dialog.taro.tsx | 165 +++++++++++++++++-----------
 src/packages/dialog/dialog.tsx      |   1 +
 3 files changed, 101 insertions(+), 72 deletions(-)

diff --git a/src/packages/dialog/dialog.scss b/src/packages/dialog/dialog.scss
index 0aed9a8a87..5dcbc5194a 100644
--- a/src/packages/dialog/dialog.scss
+++ b/src/packages/dialog/dialog.scss
@@ -8,7 +8,9 @@
   align-items: center;
   width: $dialog-width;
   min-width: $dialog-min-width;
+  /* #ifndef harmony*/
   max-height: 67%;
+  /* #endif */
   min-height: $dialog-min-height;
   padding: $dialog-padding;
   box-sizing: border-box;
@@ -112,15 +114,10 @@
         min-width: 100%;
       }
 
-      .nut-dialog-footer-ok {
-        order: 1;
-      }
-
       .nut-dialog-footer-cancel {
         margin: 0;
         color: $color-text;
         font-size: $font-size-base;
-        order: 2;
         display: flex;
         justify-content: center;
         margin-top: $dialog-vertical-footer-ok-margin-top;
diff --git a/src/packages/dialog/dialog.taro.tsx b/src/packages/dialog/dialog.taro.tsx
index 9f14971362..328399ed47 100644
--- a/src/packages/dialog/dialog.taro.tsx
+++ b/src/packages/dialog/dialog.taro.tsx
@@ -122,43 +122,68 @@ export const BaseDialog: FunctionComponent<Partial<DialogBasicProps>> & {
     const btnClass =
       hideCancelButton || hideConfirmButton ? `${classPrefix}-footer-block` : ''
 
+    const renderCancelOfVertical = () => {
+      return (
+        !hideCancelButton && (
+          <View
+            className={`${classPrefix}-footer-cancel ${btnClass}`}
+            onClick={(e: ITouchEvent) => handleCancel(e)}
+          >
+            {cancelText || locale.cancel}
+          </View>
+        )
+      )
+    }
+
+    const renderCancel = () => {
+      return (
+        !hideCancelButton && (
+          <Button
+            type="default"
+            size="large"
+            className={`${classPrefix}-footer-cancel ${btnClass}`}
+            onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
+              handleCancel(e)
+            }
+          >
+            {cancelText || locale.cancel}
+          </Button>
+        )
+      )
+    }
+
+    const renderConfirm = () => {
+      return (
+        !hideConfirmButton && (
+          <Button
+            size="large"
+            type="primary"
+            className={classNames(`${classPrefix}-footer-ok ${btnClass}`, {
+              disabled: disableConfirmButton,
+            })}
+            disabled={disableConfirmButton}
+            onClick={(e: React.MouseEvent<HTMLButtonElement>) => handleOk(e)}
+            loading={loading}
+          >
+            {confirmText || locale.confirm}
+          </Button>
+        )
+      )
+    }
+
     return (
       footer || (
         <>
-          {!hideCancelButton &&
-            (footerDirection === 'vertical' ? (
-              <View
-                className={`${classPrefix}-footer-cancel ${btnClass}`}
-                onClick={(e: ITouchEvent) => handleCancel(e)}
-              >
-                {cancelText || locale.cancel}
-              </View>
-            ) : (
-              <Button
-                type="default"
-                size="large"
-                className={`${classPrefix}-footer-cancel ${btnClass}`}
-                onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
-                  handleCancel(e)
-                }
-              >
-                {cancelText || locale.cancel}
-              </Button>
-            ))}
-
-          {!hideConfirmButton && (
-            <Button
-              size="large"
-              type="primary"
-              className={classNames(`${classPrefix}-footer-ok ${btnClass}`, {
-                disabled: disableConfirmButton,
-              })}
-              disabled={disableConfirmButton}
-              onClick={(e: React.MouseEvent<HTMLButtonElement>) => handleOk(e)}
-              loading={loading}
-            >
-              {confirmText || locale.confirm}
-            </Button>
+          {footerDirection === 'vertical' ? (
+            <>
+              {renderConfirm()}
+              {renderCancelOfVertical()}
+            </>
+          ) : (
+            <>
+              {renderCancel()}
+              {renderConfirm()}
+            </>
           )}
         </>
       )
@@ -193,46 +218,52 @@ export const BaseDialog: FunctionComponent<Partial<DialogBasicProps>> & {
     }
   }
 
+  const renderContent = () => {
+    return (
+      <CSSTransition
+        in={visible}
+        timeout={300}
+        classNames="fadeDialog"
+        unmountOnExit
+        appear
+      >
+        <Content
+          className={className}
+          style={style}
+          title={title}
+          header={header}
+          close={renderCloseIcon()}
+          footer={renderFooter()}
+          footerDirection={footerDirection}
+          visible={visible}
+        >
+          {content || children}
+        </Content>
+      </CSSTransition>
+    )
+  }
+
   return (
     <View
       style={{ display: visible ? 'block' : 'none' }}
       ref={refObject}
       catchMove={lockScroll}
     >
-      <>
-        {overlay && (
-          <Overlay
-            zIndex={zIndex}
-            visible={visible}
-            style={overlayStyle}
-            className={overlayClassName}
-            closeOnOverlayClick={closeOnOverlayClick}
-            lockScroll={lockScroll}
-            onClick={onHandleClickOverlay}
-          />
-        )}
-
-        <CSSTransition
-          in={visible}
-          timeout={300}
-          classNames="fadeDialog"
-          unmountOnExit
-          appear
+      {overlay ? (
+        <Overlay
+          zIndex={zIndex}
+          visible={visible}
+          style={overlayStyle}
+          className={overlayClassName}
+          closeOnOverlayClick={closeOnOverlayClick}
+          lockScroll={lockScroll}
+          onClick={onHandleClickOverlay}
         >
-          <Content
-            className={className}
-            style={style}
-            title={title}
-            header={header}
-            close={renderCloseIcon()}
-            footer={renderFooter()}
-            footerDirection={footerDirection}
-            visible={visible}
-          >
-            {content || children}
-          </Content>
-        </CSSTransition>
-      </>
+          {renderContent()}
+        </Overlay>
+      ) : (
+        renderContent()
+      )}
     </View>
   )
 }
diff --git a/src/packages/dialog/dialog.tsx b/src/packages/dialog/dialog.tsx
index c049d16c61..e1bb241f5d 100644
--- a/src/packages/dialog/dialog.tsx
+++ b/src/packages/dialog/dialog.tsx
@@ -93,6 +93,7 @@ const BaseDialog: ForwardRefRenderFunction<
           {!hideCancelButton &&
             (footerDirection === 'vertical' ? (
               <div
+                style={{ order: 2 }}
                 className={`${classPrefix}-footer-cancel ${btnClass}`}
                 onClick={(e) => handleCancel(e)}
               >