From 88a36b5647feefd5e1a52b246e97e212a62fcff5 Mon Sep 17 00:00:00 2001
From: landluck <landl_ww@163.com>
Date: Thu, 27 Jul 2023 20:52:22 +0800
Subject: [PATCH] feat(dialog): add confirm/cancel button slot support (#5502)

---
 packages/dialog/README.md  | 40 +++++++++---------
 packages/dialog/index.ts   |  4 +-
 packages/dialog/index.wxml | 83 +++++++++++++++++++++-----------------
 3 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index 4c855c5c..5c926b1a 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -102,21 +102,22 @@ Dialog.alert({
 ```javascript
 import Dialog from '@vant/weapp/dialog/dialog';
 
-const beforeClose = (action) => new Promise((resolve) => {
-  setTimeout(() => {
-    if (action === 'confirm') {
-      resolve(true);
-    } else {
-      // 拦截取消操作
-      resolve(false);
-    }
-  }, 1000);
-});
+const beforeClose = (action) =>
+  new Promise((resolve) => {
+    setTimeout(() => {
+      if (action === 'confirm') {
+        resolve(true);
+      } else {
+        // 拦截取消操作
+        resolve(false);
+      }
+    }, 1000);
+  });
 
 Dialog.confirm({
   title: '标题',
   message: '弹窗内容',
-  beforeClose
+  beforeClose,
 });
 ```
 
@@ -258,6 +259,8 @@ Page({
 | close-on-click-overlay | 点击遮罩层时是否关闭弹窗 | _boolean_ | `false` |
 | use-slot | 是否使用自定义内容的插槽 | _boolean_ | `false` |
 | use-title-slot | 是否使用自定义标题的插槽 | _boolean_ | `false` |
+| use-confirm-button-slot `1.10.23` | 是否使用自定义确认按钮的插槽 | _boolean_ | `false` |
+| use-cancel-button-slot `1.10.23` | 是否使用自定义取消按钮的插槽 | _boolean_ | `false` |
 | async-close | 已废弃，将在 2.0.0 移除，请使用 `beforeClose` 属性代替 | _boolean_ | `false` |
 | before-close | 关闭前的回调函数，返回 `false` 可阻止关闭，支持返回 Promise | _(action) => boolean \| Promise\<boolean\>_ | - |
 | transition | 动画名称，可选值为`fade` | _string_ | `scale` |
@@ -294,15 +297,16 @@ Page({
 
 ### Slot
 
-| 名称  | 说明                                                 |
-| ----- | ---------------------------------------------------- |
+| 名称 | 说明 |
+| --- | --- |
 | title | 自定义`title`显示内容，如果设置了`title`属性则不生效 |
+| confirm-button `1.10.23` | 自定义`confirm-button`显示内容，需要 `use-confirm-button-slot` 为 `true` |
+| cancel-button `1.10.23` | 自定义`cancel-button`显示内容，需要 `use-cancel-button-slot` 为 `true` |
 
 ### 外部样式类
 
-| 类名                   | 说明         |
-| ---------------------- | ------------ |
-| custom-class `v1.10.8` | 根节点样式类 |
-| cancle-button-class `v1.10.21` | 取消按钮样式类 |
+| 类名                            | 说明           |
+| ------------------------------- | -------------- |
+| custom-class `v1.10.8`          | 根节点样式类   |
+| cancle-button-class `v1.10.21`  | 取消按钮样式类 |
 | confirm-button-class `v1.10.21` | 确认按钮样式类 |
-
diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index 4d02eecb..45c4351b 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -21,14 +21,16 @@ VantComponent({
       type: String,
       value: 'default',
     },
-    useSlot: Boolean,
     className: String,
     customStyle: String,
     asyncClose: Boolean,
     messageAlign: String,
     beforeClose: null,
     overlayStyle: String,
+    useSlot: Boolean,
     useTitleSlot: Boolean,
+    useConfirmButtonSlot: Boolean,
+    useCancelButtonSlot: Boolean,
     showCancelButton: Boolean,
     closeOnClickOverlay: Boolean,
     confirmButtonOpenType: String,
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 364dd4c2..24ab9986 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -70,44 +70,53 @@
   </van-goods-action>
 
   <view wx:elif="{{ showCancelButton || showConfirmButton }}" class="van-hairline--top van-dialog__footer">
-    <van-button
-      wx:if="{{ showCancelButton }}"
-      size="large"
-      loading="{{ loading.cancel }}"
-      class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel cancle-button-class"
-      custom-style="color: {{ cancelButtonColor }}"
-      bind:click="onCancel"
-    >
-      {{ cancelButtonText }}
-    </van-button>
-    <van-button
-      wx:if="{{ showConfirmButton }}"
-      size="large"
-      class="van-dialog__button"
-      loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm confirm-button-class"
-      custom-style="color: {{ confirmButtonColor }}"
+    <block wx:if="{{ showCancelButton }}">
+      <slot wx:if="{{ useCancelButtonSlot }}" name="cancel-button" />
 
-      open-type="{{ confirmButtonOpenType }}"
-      lang="{{ lang }}"
-      business-id="{{ businessId }}"
-      session-from="{{ sessionFrom }}"
-      send-message-title="{{ sendMessageTitle }}"
-      send-message-path="{{ sendMessagePath }}"
-      send-message-img="{{ sendMessageImg }}"
-      show-message-card="{{ showMessageCard }}"
-      app-parameter="{{ appParameter }}"
+      <van-button
+        wx:else
+        size="large"
+        loading="{{ loading.cancel }}"
+        class="van-dialog__button van-hairline--right"
+        custom-class="van-dialog__cancel cancle-button-class"
+        custom-style="color: {{ cancelButtonColor }}"
+        bind:click="onCancel"
+      >
+        {{ cancelButtonText }}
+      </van-button>
+    </block>
 
-      bind:click="onConfirm"
-      bindgetuserinfo="onGetUserInfo"
-      bindcontact="onContact"
-      bindgetphonenumber="onGetPhoneNumber"
-      binderror="onError"
-      bindlaunchapp="onLaunchApp"
-      bindopensetting="onOpenSetting"
-    >
-      {{ confirmButtonText }}
-    </van-button>
+    <block wx:if="{{ showConfirmButton }}">
+      <slot wx:if="{{ useConfirmButtonSlot }}" name="confirm-button" />
+
+      <van-button
+        wx:else
+        size="large"
+        class="van-dialog__button"
+        loading="{{ loading.confirm }}"
+        custom-class="van-dialog__confirm confirm-button-class"
+        custom-style="color: {{ confirmButtonColor }}"
+
+        open-type="{{ confirmButtonOpenType }}"
+        lang="{{ lang }}"
+        business-id="{{ businessId }}"
+        session-from="{{ sessionFrom }}"
+        send-message-title="{{ sendMessageTitle }}"
+        send-message-path="{{ sendMessagePath }}"
+        send-message-img="{{ sendMessageImg }}"
+        show-message-card="{{ showMessageCard }}"
+        app-parameter="{{ appParameter }}"
+
+        bind:click="onConfirm"
+        bindgetuserinfo="onGetUserInfo"
+        bindcontact="onContact"
+        bindgetphonenumber="onGetPhoneNumber"
+        binderror="onError"
+        bindlaunchapp="onLaunchApp"
+        bindopensetting="onOpenSetting"
+      >
+        {{ confirmButtonText }}
+      </van-button>
+    </block>
   </view>
 </van-popup>