From a4e60dee6b858206ac135940933edef7c2281d72 Mon Sep 17 00:00:00 2001
From: z2014 <591763389@qq..com>
Date: Wed, 22 Jul 2020 23:40:45 +0800
Subject: [PATCH 1/4] fix: issue 320
---
src/components/dialog/dialog.js | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index 6215e91..f625dca 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -48,7 +48,7 @@ class Dialog extends Component {
renderButtons() {
return this.props.buttons.map((action, idx) => {
- const {type, label, ...others} = action;
+ const {type, label, onClick, ...others} = action;
const className = classNames({
'weui-dialog__btn': true,
'weui-dialog__btn_default': type === 'default',
@@ -56,7 +56,17 @@ class Dialog extends Component {
});
return (
- {label}
+ {
+ e.preventDefault();
+ onClick && typeof onClick === 'function' && onClick(e);
+ return false;
+ }}
+ {...others}
+ className={className}
+ >{label}
);
});
}
From 253822e44e5d001ae66efb6dac4a27a2d24a764b Mon Sep 17 00:00:00 2001
From: Aquariuslt
Date: Thu, 23 Jul 2020 00:27:47 +0800
Subject: [PATCH 2/4] fix(dialog) resolve lint issue
src/components/dialog/dialog.js
---
src/components/dialog/dialog.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index f625dca..444a153 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -61,7 +61,9 @@ class Dialog extends Component {
href="#"
onClick={(e) => {
e.preventDefault();
- onClick && typeof onClick === 'function' && onClick(e);
+ if (onClick && typeof onClick === 'function') {
+ onClick(e);
+ }
return false;
}}
{...others}
From 47999386b5e4d9324ca7ed7b0ec2b1775747fe42 Mon Sep 17 00:00:00 2001
From: Aquariuslt
Date: Thu, 23 Jul 2020 00:36:55 +0800
Subject: [PATCH 3/4] fix(dialog): resolve test issue
src/components/dialog/dialog.js
---
src/components/dialog/dialog.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index 444a153..219620e 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -60,7 +60,9 @@ class Dialog extends Component {
key={idx}
href="#"
onClick={(e) => {
- e.preventDefault();
+ if (e) {
+ e.preventDefault();
+ }
if (onClick && typeof onClick === 'function') {
onClick(e);
}
From dcc929b2caec954d2ec03810680a4f11e1a624a5 Mon Sep 17 00:00:00 2001
From: z2014 <591763389@qq.com>
Date: Thu, 23 Jul 2020 10:40:59 +0800
Subject: [PATCH 4/4] feat: update version 1.2.3
---
CHANGELOG.md | 4 ++++
package.json | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b26ba..ac95045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
### CHANGELOG
+#### 1.2.3
+
+- fix: issue 320
+
#### 1.2.2
Changes
diff --git a/package.json b/package.json
index db74201..ca93e9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-weui",
- "version": "1.2.2",
+ "version": "1.2.3",
"description": "weui for react",
"main": "./build/packages/index.js",
"scripts": {