feat(button): add button-id prop & agreePrivacyAuthorization event su…

…pport (#5533)
youzan · Aug 30, 2023 · fd41bd8 · fd41bd8
1 parent b9dea4f
commit fd41bd8
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -240,6 +240,7 @@ Page({
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | show | 是否显示弹窗 | _boolean_ | - |
+| confirm-button-id `v1.10.25`| 确认按钮的标识符，作为底层原生button组件的id值 | _string_ | - |
 | title | 标题 | _string_ | - |
 | width | 弹窗宽度，默认单位为`px` | _string \| number_ | `320px` |
 | message | 文本内容，支持通过`\n`换行 | _string_ | - |
@@ -292,7 +293,7 @@ Page({
 | bind:contact | 客服消息回调 | - |
 | bind:getphonenumber | 获取用户手机号回调 | - |
 | bind:getrealtimephonenumber `v1.10.21` | 获取手机号实时验证回调，open-type=getRealtimePhoneNumber 时有效 | - |
-| bind:agreeprivacyauthorization `v1.10.24` | 同意隐私协议回调，openType="agreePrivacyAuthorization"时有效 | - |
+| bind:agreeprivacyauthorization `v1.10.25` | 同意隐私协议回调，openType="agreePrivacyAuthorization"时有效 | - |
 | bind:error | 当使用开放能力时，发生错误的回调 | - |
 | bind:opensetting | 在打开授权设置页后回调 | - |
 

diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
@@ -21,6 +21,7 @@ VantComponent({
       type: String,
       value: 'default',
     },
+    confirmButtonId: String,
     className: String,
     customStyle: String,
     asyncClose: Boolean,

diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
@@ -46,7 +46,7 @@
       loading="{{ loading.confirm }}"
       custom-class="van-dialog__confirm confirm-button-class"
       custom-style="color: {{ confirmButtonColor }}"
-
+      button-id="{{ confirmButtonId }}"
       open-type="{{ confirmButtonOpenType }}"
       lang="{{ lang }}"
       business-id="{{ businessId }}"
@@ -56,7 +56,7 @@
       send-message-img="{{ sendMessageImg }}"
       show-message-card="{{ showMessageCard }}"
       app-parameter="{{ appParameter }}"
-
+      bindagreeprivacyauthorization="onAgreePrivacyAuthorization"
       bind:click="onConfirm"
       bindgetuserinfo="onGetUserInfo"
       bindcontact="onContact"
@@ -96,7 +96,7 @@
         loading="{{ loading.confirm }}"
         custom-class="van-dialog__confirm confirm-button-class"
         custom-style="color: {{ confirmButtonColor }}"
-
+        button-id="{{ confirmButtonId }}"
         open-type="{{ confirmButtonOpenType }}"
         lang="{{ lang }}"
         business-id="{{ businessId }}"
@@ -106,7 +106,7 @@
         send-message-img="{{ sendMessageImg }}"
         show-message-card="{{ showMessageCard }}"
         app-parameter="{{ appParameter }}"
-
+        bindagreeprivacyauthorization="onAgreePrivacyAuthorization"
         bind:click="onConfirm"
         bindgetuserinfo="onGetUserInfo"
         bindcontact="onContact"

diff --git 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 }}"
@@ -23,6 +24,7 @@
   bindcontact="onContact"
   bindopensetting="onOpenSetting"
   bindgetuserinfo="onGetUserInfo"
+  bindagreeprivacyauthorization="onAgreePrivacyAuthorization"
   bindgetphonenumber="onGetPhoneNumber"
   bindlaunchapp="onLaunchApp"
 >

diff --git 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/goods-action/test/__snapshots__/demo.spec.ts.snap b/packages/goods-action/test/__snapshots__/demo.spec.ts.snap
@@ -157,6 +157,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--warning van-goods-action-button--first"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -209,6 +210,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--danger van-goods-action-button--last"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -490,6 +492,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--warning van-goods-action-button--first"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -540,6 +543,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--danger van-goods-action-button--last"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -741,6 +745,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--warning van-goods-action-button--first"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -791,6 +796,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--danger van-goods-action-button--last"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -992,6 +998,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--warning van-goods-action-button--first"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"
@@ -1042,6 +1049,7 @@ exports[`should render demo and match snapshot 1`] = `
             <van-button
               class="van-goods-action-button van-goods-action-button--danger van-goods-action-button--last van-goods-action-button--plain"
               customClass="van-goods-action-button__inner custom-class"
+              bind:agreeprivacyauthorization="onAgreePrivacyAuthorization"
               bind:click="onClick"
               bind:contact="onContact"
               bind:error="onError"

diff --git 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,