fix: disabled button tap can callback

ant-design · Aug 29, 2024 · 54b29ea · 54b29ea
1 parent d9e6199
commit 54b29ea
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/compiled/alipay/demo/pages/Stepper/index.js b/compiled/alipay/demo/pages/Stepper/index.js
@@ -39,7 +39,8 @@ Page({
     handleMinusValue() {
         this.setData({ value: this.data.value - 1 });
     },
-    handleDisabledTap() {
+    handleDisabledTap(e) {
+        console.log('禁用点击：', e.target.dataset);
         my.showToast({ content: '禁用点击' });
     },
 });
diff --git a/compiled/alipay/src/Stepper/index.ts b/compiled/alipay/src/Stepper/index.ts
@@ -1,9 +1,4 @@
-import {
-  Component,
-  triggerEvent,
-  getValueFromProps,
-  triggerEventOnly,
-} from '../_util/simply';
+import { Component, triggerEvent, getValueFromProps } from '../_util/simply';
 import { StepperDefaultProps } from './props';
 import { getPrecision, getValidNumber } from './utils';
 import mixinValue from '../mixins/value';
@@ -34,7 +29,8 @@ Component(
       triggerEvent(this, 'blur', value === '' ? null : Number(value), e);
     },
     onDisabledTap(e) {
-      triggerEventOnly(this, 'disabledTap', e);
+      const onDisabledTap = getValueFromProps(this, 'onDisabledTap');
+      onDisabledTap && onDisabledTap(e);
     },
     onTap(e) {
       const [

diff --git a/compiled/wechat/demo/pages/Stepper/index.js b/compiled/wechat/demo/pages/Stepper/index.js
@@ -39,7 +39,8 @@ Page({
     handleMinusValue() {
         this.setData({ value: this.data.value - 1 });
     },
-    handleDisabledTap() {
+    handleDisabledTap(e) {
+        console.log('禁用点击：', e.target.dataset);
         my.showToast({ content: '禁用点击' });
     },
 });
diff --git a/compiled/wechat/src/Stepper/index.js b/compiled/wechat/src/Stepper/index.js
@@ -1,4 +1,4 @@
-import { Component, triggerEvent, getValueFromProps, triggerEventOnly, } from '../_util/simply';
+import { Component, triggerEvent, getValueFromProps, } from '../_util/simply';
 import { StepperDefaultProps } from './props';
 import { getPrecision, getValidNumber } from './utils';
 import mixinValue from '../mixins/value';
@@ -25,7 +25,8 @@ Component(StepperDefaultProps, {
         triggerEvent(this, 'blur', value === '' ? null : Number(value), e);
     },
     onDisabledTap: function (e) {
-        triggerEventOnly(this, 'disabledTap', e);
+        var onDisabledTap = getValueFromProps(this, 'onDisabledTap');
+        onDisabledTap && onDisabledTap(e);
     },
     onTap: function (e) {
         var _a = getValueFromProps(this, [

diff --git a/demo/pages/Stepper/index.ts b/demo/pages/Stepper/index.ts
@@ -48,7 +48,8 @@ Page({
   handleMinusValue() {
     this.setData({ value: this.data.value - 1 });
   },
-  handleDisabledTap() {
+  handleDisabledTap(e) {
+    console.log('禁用点击：', e.target.dataset);
     my.showToast({ content: '禁用点击' });
   },
 });
diff --git a/src/Stepper/index.ts b/src/Stepper/index.ts
@@ -1,9 +1,4 @@
-import {
-  Component,
-  triggerEvent,
-  getValueFromProps,
-  triggerEventOnly,
-} from '../_util/simply';
+import { Component, triggerEvent, getValueFromProps } from '../_util/simply';
 import { StepperDefaultProps } from './props';
 import { getPrecision, getValidNumber } from './utils';
 import mixinValue from '../mixins/value';
@@ -34,7 +29,8 @@ Component(
       triggerEvent(this, 'blur', value === '' ? null : Number(value), e);
     },
     onDisabledTap(e) {
-      triggerEventOnly(this, 'disabledTap', e);
+      const onDisabledTap = getValueFromProps(this, 'onDisabledTap');
+      onDisabledTap && onDisabledTap(e);
     },
     onTap(e) {
       const [