Merge commit '87fe678b' into alpha

src/core/view/mixins/animation.js

@@ -19,7 +19,7 @@ function converType (type) {
 function getStyle (action) {
   const animateTypes1 = ['matrix', 'matrix3d', 'scale', 'scale3d', 'rotate3d', 'skew', 'translate', 'translate3d']
   const animateTypes2 = ['scaleX', 'scaleY', 'scaleZ', 'rotate', 'rotateX', 'rotateY', 'rotateZ', 'skewX', 'skewY', 'translateX', 'translateY', 'translateZ']
-  const animateTypes3 = ['opacity', 'backgroundColor']
+  const animateTypes3 = ['opacity', 'background-color']
   const animateTypes4 = ['width', 'height', 'left', 'right', 'top', 'bottom']
   const animates = action.animates
   const option = action.option

src/platforms/h5/components/app/popup/mixins/toast.js

@@ -7,7 +7,7 @@ export default {
     }
   },
   created () {
-    let showType = ''
+    let showType = ''
 
     const createOnShow = (type) => {
       return (args) => {
@@ -23,6 +23,9 @@ export default {
 
     const createOnHide = (type) => {
       return () => {
+        if (!showType) {
+          return
+        }
         let warnMsg = ''
         if (type === 'onHideToast' && showType !== 'onShowToast') {
           warnMsg = '请注意 showToast 与 hideToast 必须配对使用'
@@ -31,7 +34,7 @@ export default {
         }
         if (warnMsg) {
           return console.warn(warnMsg)
-        }
+        }
         showType = ''
         setTimeout(() => { // 与 show 对应延迟10ms，避免快速调用 show，hide 导致无法关闭
           this.showToast.visible = false