fix(view): 修复badge传参为空字符的情况

jd-opensource · Aug 17, 2018 · a6fc736 · a6fc736
1 parent 53555f9
commit a6fc736
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/components/badge/index.js b/src/components/badge/index.js
@@ -12,6 +12,7 @@ export default class AtBadge extends Taro.Component {
   }
 
   formatValue (value, maxValue) {
+    if (value === '' || value === null) return ''
     const numValue = +value
     if (loadash.isNaN(numValue)) {
       return value
@@ -27,10 +28,12 @@ export default class AtBadge extends Taro.Component {
     } = this.props
     const rootClassName = ['at-badge']
 
+    const val = this.formatValue(value, maxValue)
+
     return (
       <View className={rootClassName}>
         {this.props.children}
-        {dot ? <View className='at-badge__dot'></View> : <View className='at-badge__num'>{this.formatValue(value, maxValue)}</View>}
+        {dot ? <View className='at-badge__dot'></View> : val !== '' && <View className='at-badge__num'>{val}</View>}
       </View>
     )
   }

diff --git a/src/pages/view/badge/index.js b/src/pages/view/badge/index.js
@@ -18,8 +18,9 @@ export default class BadgePage extends Taro.Component {
 
     }
   }
-
+  /** eslint-disable */
   render () {
+    const dot = '···'
     return (
       <View className='page'>
         {/* S Header */}
@@ -91,12 +92,12 @@ export default class BadgePage extends Taro.Component {
             <View className='panel__content'>
               <View className='badge-item'>
                 <View className='subitem'>
-                  <AtBadge value='···'>
+                  <AtBadge value={dot}>
                     <AtButton size='small' circle>按钮</AtButton>
                   </AtBadge>
                 </View>
                 <View className='subitem'>
-                  <AtBadge value='···'>
+                  <AtBadge value={dot}>
                     <AtButton size='small'>按钮</AtButton>
                   </AtBadge>
                 </View>