diff --git a/packages/dialog/Dialog.js b/packages/dialog/Dialog.js index 385109abd..cf2014200 100644 --- a/packages/dialog/Dialog.js +++ b/packages/dialog/Dialog.js @@ -8,9 +8,9 @@ export default sfc({ mixins: [Popup], props: { - className: null, title: String, message: String, + className: null, callback: Function, beforeClose: Function, messageAlign: String, diff --git a/packages/swipe/index.js b/packages/swipe/index.js index e4f3d47e8..7df10b715 100644 --- a/packages/swipe/index.js +++ b/packages/swipe/index.js @@ -1,6 +1,6 @@ import { use } from '../utils'; import Touch from '../mixins/touch'; -import { on, off, stop } from '../utils/event'; +import { on, off } from '../utils/event'; const [sfc, bem] = use('swipe'); @@ -256,8 +256,9 @@ export default sfc({ }, onTransitionend(event) { - event.stopPropagation(); - this.$emit('change', this.activeIndicator); + if (event.currentTarget === this.$refs.track) { + this.$emit('change', this.activeIndicator); + } } }, @@ -267,7 +268,7 @@ export default sfc({ const Indicator = this.slots('indicator') || (this.showIndicators && count > 1 && ( -
+
{Array(...Array(count)).map((empty, index) => (