fix(button): 小程序button开放能力回调

jd-opensource · Sep 28, 2018 · 1d6811d · 1d6811d
1 parent 8c4fea3
commit 1d6811d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/src/components/button/index.js b/src/components/button/index.js
@@ -22,13 +22,6 @@ export default class AtButton extends AtComponent {
     super(...arguments)
     this.state = {
       isWEAPP: Taro.getEnv() === Taro.ENV_TYPE.WEAPP,
-      BUTTON_PROPS_FUNC: {
-        ONGETUSERINFO: 'onGetUserInfo',
-        ONGETPHONENUMBER: 'onGetPhoneNumber',
-        ONCONTACT: 'onContact',
-        ONERROR: 'onError',
-        ONOPENSETTING: 'onOpenSetting'
-      }
     }
   }
 
@@ -39,11 +32,25 @@ export default class AtButton extends AtComponent {
     }
   }
 
-  onButtonCall () {
-    const _arg = [...arguments]
-    const type = _arg.shift()
-    if (!type || this.props.disabled) return
-    this.props[type] && this.props[type](..._arg)
+  onGetUserInfo () {
+    console.log('getuserinfo', arguments)
+    this.props.onGetUserInfo && this.props.onGetUserInfo(...arguments)
+  }
+
+  onContact () {
+    this.props.onContact && this.props.onContact(...arguments)
+  }
+
+  onGetPhoneNumber () {
+    this.props.onGetPhoneNumber && this.props.onGetPhoneNumber(...arguments)
+  }
+
+  onError () {
+    this.props.onError && this.props.onError(...arguments)
+  }
+
+  onOpenSetting () {
+    this.props.onOpenSetting && this.props.onOpenSetting(...arguments)
   }
 
   render () {
@@ -67,7 +74,6 @@ export default class AtButton extends AtComponent {
     } = this.props
     const {
       isWEAPP,
-      BUTTON_PROPS_FUNC,
     } = this.state
     let rootClassName = ['at-button']
     const sizeClass = SIZE_CLASS[size] || ''
@@ -100,11 +106,11 @@ export default class AtButton extends AtComponent {
           sendMessageImg={sendMessageImg}
           showMessageCard={showMessageCard}
           appParameter={appParameter}
-          onGetUserInfo={this.onButtonCall.bind(this, BUTTON_PROPS_FUNC.ONGETUSERINFO)}
-          onGetPhoneNumber={this.onButtonCall.bind(this, BUTTON_PROPS_FUNC.ONGETPHONENUMBER)}
-          onOpenSetting={this.onButtonCall.bind(this, BUTTON_PROPS_FUNC.ONOPENSETTING)}
-          onError={this.onButtonCall.bind(this, BUTTON_PROPS_FUNC.ONERROR)}
-          onContact={this.onButtonCall.bind(this, BUTTON_PROPS_FUNC.ONCONTACT)}
+          onGetUserInfo={this.onGetUserInfo.bind(this)}
+          onGetPhoneNumber={this.onGetPhoneNumber.bind(this)}
+          onOpenSetting={this.onOpenSetting.bind(this)}
+          onError={this.onError.bind(this)}
+          onContact={this.onContact.bind(this)}
         >
         </Button>}
         {component}<View className='at-button__text'>{this.props.children}</View>

diff --git a/src/pages/basic/button/index.js b/src/pages/basic/button/index.js
@@ -26,6 +26,10 @@ export default class ButtonPage extends Taro.Component {
     }
   }
 
+  onContact () {
+    console.log('呼起客服回调')
+  }
+
   render () {
     return (
       <View className='page'>
@@ -171,7 +175,7 @@ export default class ButtonPage extends Taro.Component {
                 <AtButton openType='share' type='primary' onClick={this.onButtonClick.bind(this, '打开分享（仅小程序版支持）')}>分享</AtButton>
               </View>
               <View className='btn-item'>
-                <AtButton type='secondary' openType='contact' onClick={this.onButtonClick.bind(this, '打开客服（仅小程序版支持）')}>联系 Taro UI 客服</AtButton>
+                <AtButton type='secondary' openType='contact' onClick={this.onButtonClick.bind(this, '打开客服（仅小程序版支持）')} onContact={this.onContact.bind(this)}>联系 Taro UI 客服</AtButton>
               </View>
             </View>
           </View>