From e4d720a26109917d2613694fd644e8701315f254 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 17 Jun 2021 10:04:14 +0800
Subject: [PATCH] fix(Dialog): allow message function to return html (#8872)

---
 src/dialog/Dialog.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/dialog/Dialog.tsx b/src/dialog/Dialog.tsx
index a5364a7bf..ad1ed8474 100644
--- a/src/dialog/Dialog.tsx
+++ b/src/dialog/Dialog.tsx
@@ -128,14 +128,13 @@ export default defineComponent({
         [messageAlign as string]: messageAlign,
       });
 
-      if (allowHtml && typeof message === 'string') {
-        return <div class={classNames} innerHTML={message} />;
+      const content = isFunction(message) ? message() : message;
+
+      if (allowHtml && typeof content === 'string') {
+        return <div class={classNames} innerHTML={content} />;
       }
-      return (
-        <div class={classNames}>
-          {isFunction(message) ? message() : message}
-        </div>
-      );
+
+      return <div class={classNames}>{content}</div>;
     };
 
     const renderContent = () => {