fix(message): 适配百度

jd-opensource · Jan 24, 2019 · b55cc89 · b55cc89
1 parent e998455
commit b55cc89
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/components/message/index.js b/src/components/message/index.js
@@ -8,24 +8,30 @@ export default class AtMessage extends AtComponent {
   constructor () {
     super(...arguments)
     this.state = {
-      isOpened: false,
-      message: '',
-      type: 'info',
-      duration: 3000,
+      _isOpened: false,
+      _message: '',
+      _type: 'info',
+      _duration: 3000,
     }
     this._timer = null
   }
 
   bindMessageListener () {
     Taro.eventCenter.on('atMessage', (options = {}) => {
-      options.isOpened = true
-      this.setState(options, () => {
+      const { message, type, duration } = options
+      const newState = {
+        _isOpened: true,
+        _message: message,
+        _type: type,
+        _duration: duration || this.state._duration
+      }
+      this.setState(newState, () => {
         clearTimeout(this._timer)
         this._timer = setTimeout(() => {
           this.setState({
-            isOpened: false
+            _isOpened: false
           })
-        }, this.state.duration)
+        }, this.state._duration)
       })
     })
     // 绑定函数
@@ -53,26 +59,20 @@ export default class AtMessage extends AtComponent {
       className,
       customStyle,
     } = this.props
-
     const {
-      message,
-      isOpened,
-      type,
+      _message,
+      _isOpened,
+      _type,
     } = this.state
+    const rootCls = classNames({
+      'at-message': true,
+      'at-message--show': _isOpened,
+      'at-message--hidden': !_isOpened
+    }, `at-message--${_type}`, className)
 
-    return (
-      <View
-        className={
-          classNames({
-            'at-message': true,
-            'at-message--show': isOpened,
-            'at-message--hidden': !isOpened
-          }, `at-message--${type}`, className)}
-        style={customStyle}
-      >
-        {message}
-      </View>
-    )
+    return <View className={rootCls} style={customStyle}>
+      {_message}
+    </View>
   }
 }
 

diff --git a/src/pages/action/message/index.js b/src/pages/action/message/index.js
@@ -29,7 +29,7 @@ export default class ToastPage extends Component {
             <View className='panel__title'>基本案例</View>
             <View className='panel__content'>
               <View className='example-item'>
-                <AtButton onClick={this.handleClick.bind(this)}>
+                <AtButton onClick={this.handleClick.bind(this, 'info')}>
                   普通消息
                 </AtButton>
               </View>