fix(components): 修复组件报错

jd-opensource · Sep 28, 2018 · 05d035f · 05d035f
1 parent 1b8128c
commit 05d035f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/src/components/grid/index.js b/src/components/grid/index.js
@@ -91,7 +91,7 @@ AtGrid.propTypes = {
   mode: PropTypes.string,
   onClick: PropTypes.func,
   hasBorder: PropTypes.bool,
-  columnNum: PropTypes.oneOf([PropTypes.string, PropTypes.number]),
+  columnNum: PropTypes.number,
   data: PropTypes.arrayOf(
     PropTypes.shape({
       icon: PropTypes.string,

diff --git a/src/components/toast/index.js b/src/components/toast/index.js
@@ -65,10 +65,8 @@ export default class AtToast extends AtComponent {
 
   componentWillReceiveProps (nextProps) {
     const { isOpened, duration } = nextProps
-    if (!isOpened && this.state._isOpened) {
-      this.setState({
-        _isOpened: false
-      })
+    if (!isOpened) {
+      this.close()
       return
     }
 
@@ -155,5 +153,5 @@ AtToast.propTypes = {
   image: PropTypes.string,
   isOpened: PropTypes.bool,
   duration: PropTypes.number,
-  status: PropTypes.oneOf(['error', 'loading', 'success'])
+  status: PropTypes.oneOf(['', 'error', 'loading', 'success'])
 }
diff --git a/src/pages/action/activity-indicator/index.js b/src/pages/action/activity-indicator/index.js
@@ -32,13 +32,13 @@ export default class ActivityIndicatorPage extends Taro.Component {
             <View className='panel__content'>
               <View className='example-item'>
                 <View className='subitem'>
-                  <AtActivityIndicator size='20' ></AtActivityIndicator>
+                  <AtActivityIndicator size={20} ></AtActivityIndicator>
                 </View>
                 <View className='subitem'>
-                  <AtActivityIndicator size='24' />
+                  <AtActivityIndicator size={24} />
                 </View>
                 <View className='subitem'>
-                  <AtActivityIndicator size='32' />
+                  <AtActivityIndicator size={32} />
                 </View>
               </View>
             </View>

diff --git a/src/pages/action/progress/index.js b/src/pages/action/progress/index.js
@@ -63,13 +63,13 @@ export default class ProgressPage extends Taro.Component {
             <View className='panel__title'>基础进度条</View>
             <View className='panel__content'>
               <View className='example-item'>
-                <AtProgress percent='25' />
+                <AtProgress percent={25} />
               </View>
               <View className='example-item'>
-                <AtProgress percent='50' />
+                <AtProgress percent={50} />
               </View>
               <View className='example-item'>
-                <AtProgress percent='75' />
+                <AtProgress percent={75} />
               </View>
             </View>
           </View>
@@ -79,10 +79,10 @@ export default class ProgressPage extends Taro.Component {
             <View className='panel__title'>隐藏进度文案</View>
             <View className='panel__content'>
               <View className='example-item'>
-                <AtProgress percent='25' isHidePercent />
+                <AtProgress percent={25} isHidePercent />
               </View>
               <View className='example-item'>
-                <AtProgress percent='75' isHidePercent />
+                <AtProgress percent={75} isHidePercent />
               </View>
             </View>
           </View>
@@ -92,13 +92,13 @@ export default class ProgressPage extends Taro.Component {
             <View className='panel__title'>自定义进度条线宽</View>
             <View className='panel__content'>
               <View className='example-item'>
-                <AtProgress percent='25' strokeWidth='6' />
+                <AtProgress percent={25} strokeWidth={6} />
               </View>
               <View className='example-item'>
-                <AtProgress percent='50' strokeWidth='8' />
+                <AtProgress percent={50} strokeWidth={8} />
               </View>
               <View className='example-item'>
-                <AtProgress percent='75' strokeWidth='10' />
+                <AtProgress percent={75} strokeWidth={10} />
               </View>
             </View>
           </View>
@@ -108,13 +108,13 @@ export default class ProgressPage extends Taro.Component {
             <View className='panel__title'>自定义颜色</View>
             <View className='panel__content'>
               <View className='example-item'>
-                <AtProgress percent='25' color='#FF4949' />
+                <AtProgress percent={25} color='#FF4949' />
               </View>
               <View className='example-item'>
-                <AtProgress percent='50' color='#13CE66' />
+                <AtProgress percent={50} color='#13CE66' />
               </View>
               <View className='example-item'>
-                <AtProgress percent='75' color='#FFC82C' />
+                <AtProgress percent={75} color='#FFC82C' />
               </View>
             </View>
           </View>
@@ -125,19 +125,19 @@ export default class ProgressPage extends Taro.Component {
             <View className='panel__content'>
               <View className='example-item'>
                 <View className='example-item__desc'>暂停</View>
-                <AtProgress percent='25' />
+                <AtProgress percent={25} />
               </View>
               <View className='example-item'>
                 <View className='example-item__desc'>进行中</View>
-                <AtProgress percent='50' status='progress' />
+                <AtProgress percent={50} status='progress' />
               </View>
               <View className='example-item'>
                 <View className='example-item__desc'>错误</View>
-                <AtProgress percent='75' status='error' />
+                <AtProgress percent={75} status='error' />
               </View>
               <View className='example-item'>
                 <View className='example-item__desc'>已完成</View>
-                <AtProgress percent='100' status='success' />
+                <AtProgress percent={10} status='success' />
               </View>
             </View>
           </View>

diff --git a/src/pages/action/toast/index.js b/src/pages/action/toast/index.js
@@ -29,9 +29,7 @@ export default class ToastPage extends Component {
 
   handleClick = (text, icon, image, hasMask, status) => {
     if (this.state.isOpened) {
-      return this.setState({
-        isOpened: false
-      })
+      return this.setState(INIT_STATE)
     }
     const state = Object.assign(
       { ...INIT_STATE, isOpened: true },
@@ -210,6 +208,7 @@ export default class ToastPage extends Component {
           hasMask={hasMask}
           isOpened={isOpened}
           duration={duration}
+          onClose={this.handleClose}
         />
       </View>
     )