From ea631a81a3830b7e85533e046ca141837fcc604c Mon Sep 17 00:00:00 2001
From: johnsonwong666 <64689255+johnsonwong666@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:02:08 +0800
Subject: [PATCH] feat(button): add button-id prop support (#5529)

---
 packages/button/README.md               | 1 +
 packages/button/index.wxml              | 2 +-
 packages/dialog/README.md               | 1 +
 packages/dialog/index.wxml              | 2 +-
 packages/goods-action-button/index.wxml | 1 +
 packages/goods-action/README.md         | 1 +
 packages/mixins/button.ts               | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/button/README.md b/packages/button/README.md
index 79a8d737..daf2b7ff 100644
--- a/packages/button/README.md
+++ b/packages/button/README.md
@@ -120,6 +120,7 @@
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | id | 标识符 | _string_ | - |
+| button-id `v1.10.25`| 标识符，作为原生button组件的id值 | _string_ | - |
 | type | 按钮类型，可选值为 `primary` `info` `warning` `danger` | _string_ | `default` |
 | size | 按钮尺寸，可选值为 `normal` `large` `small` `mini` | _string_ | `normal` |
 | color `v1.0.0` | 按钮颜色，支持传入`linear-gradient`渐变色 | _string_ | - |
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index bfe8bce8..e7f60f19 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -2,7 +2,7 @@
 <wxs src="./index.wxs" module="computed" />
 
 <button
-  id="{{ id }}"
+  id="{{ id || buttonId }}"
   data-detail="{{ dataset }}"
   class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
   hover-class="{{ disabled || loading ? '' : 'van-button--active hover-class'}}"
diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index ee238f44..8ad856cc 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -240,6 +240,7 @@ Page({
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | show | 是否显示弹窗 | _boolean_ | - |
+| button-id `v1.10.25`| 标识符，作为原生button组件的id值 | _string_ | - |
 | title | 标题 | _string_ | - |
 | width | 弹窗宽度，默认单位为`px` | _string \| number_ | `320px` |
 | message | 文本内容，支持通过`\n`换行 | _string_ | - |
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 24ab9986..9c44252e 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -96,7 +96,7 @@
         loading="{{ loading.confirm }}"
         custom-class="van-dialog__confirm confirm-button-class"
         custom-style="color: {{ confirmButtonColor }}"
-
+        button-id="{{ buttonId }}"
         open-type="{{ confirmButtonOpenType }}"
         lang="{{ lang }}"
         business-id="{{ businessId }}"
diff --git a/packages/goods-action-button/index.wxml b/packages/goods-action-button/index.wxml
index 6451c65a..03623820 100644
--- a/packages/goods-action-button/index.wxml
+++ b/packages/goods-action-button/index.wxml
@@ -1,6 +1,7 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 <van-button
   id="{{ id }}"
+  button-id="{{ buttonId }}"
   lang="{{ lang }}"
   type="{{ type }}"
   size="{{ size }}"
diff --git a/packages/goods-action/README.md b/packages/goods-action/README.md
index 93de506e..b88d2688 100644
--- a/packages/goods-action/README.md
+++ b/packages/goods-action/README.md
@@ -130,6 +130,7 @@ Page({
 | url | 点击后跳转的链接地址 | _string_ | - |
 | link-type | 链接跳转类型，可选值为 `redirectTo` `switchTab` `reLaunch` | _string_ | `navigateTo` |
 | id | 标识符 | _string_ | - |
+| button-id `v1.10.25`| 标识符，作为原生button组件的id值 | _string_ | - |
 | type | 按钮类型，可选值为 `primary` `warning` `danger` | _string_ | `danger` |
 | plain | 是否为朴素按钮 | _boolean_ | `false` |
 | size | 按钮尺寸，可选值为 `normal` `large` `small` `mini` | _string_ | `normal` |
diff --git a/packages/mixins/button.ts b/packages/mixins/button.ts
index c4e6bd9e..541729ba 100644
--- a/packages/mixins/button.ts
+++ b/packages/mixins/button.ts
@@ -5,6 +5,7 @@ export const button = Behavior({
 
   properties: {
     id: String,
+    buttonId: String,
     lang: String,
     businessId: Number,
     sessionFrom: String,