fix:更新组件内事件冒泡和阻止冒泡 (#391)

二一 · 7insummer · commit 189689256dd0 · 2019-08-03T22:02:00.000+08:00
diff --git a/examples/dist/action-sheet/index.js b/examples/dist/action-sheet/index.js
@@ -87,7 +87,7 @@ Component({
         success
       } = this.data;
       success && success({ ...e.currentTarget.dataset });
-      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset });
+      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 
@@ -112,7 +112,7 @@ Component({
       });
       this.triggerEvent('lincancel', {
         errMsg: 'showactionsheet:fail cancel'
-      });
+      },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 
diff --git a/examples/dist/badge/index.js b/examples/dist/badge/index.js
@@ -56,8 +56,7 @@ Component({
     },
     // 点击事件
     handleTap() {
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch', {}, { bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
     },
   }
 });
diff --git a/examples/dist/count-selector/index.js b/examples/dist/count-selector/index.js
@@ -67,7 +67,7 @@ Component({
         count: this.data.count,
         type: 'blur'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
 
     reduceTap() {
@@ -84,7 +84,7 @@ Component({
         count: this.data.count,
         type: 'reduce'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
 
     addTap() {
@@ -101,7 +101,7 @@ Component({
         count: this.data.count,
         type: 'add'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
   }
 })
diff --git a/examples/dist/custom-tab-bar/index.js b/examples/dist/custom-tab-bar/index.js
@@ -90,7 +90,7 @@ Component({
         idx,
         path:this.route
       };
-      let option = {};
+      let option = { bubbles: true, composed: true };
       this.triggerEvent('lintap', detail, option);
     },
     showRedDot(idx) {
diff --git a/examples/dist/dialog/index.js b/examples/dist/dialog/index.js
@@ -155,7 +155,7 @@ Component({
     onCancelTap(e) {
 
       let detail = 'cancel';
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       const {
         success
@@ -175,7 +175,7 @@ Component({
     // 背景点击事件
     onDialogTap(e) {
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({
diff --git a/examples/dist/grid-item/index.js b/examples/dist/grid-item/index.js
@@ -22,9 +22,7 @@ Component({
         tapGridItem(e) {
             this.triggerEvent('lintap', {
                 ...e
-            }, {
-                composed: true
-            })
+            }, { bubbles: true, composed: true })
         },
     }
 });
diff --git a/examples/dist/grid/index.js b/examples/dist/grid/index.js
@@ -70,7 +70,7 @@ Component({
         tapGrid(e) {
             this.triggerEvent('lintap', {
                 index:this.data.currentIndex
-            })
+            },{ bubbles: true, composed: true })
         }
     }
 });
diff --git a/examples/dist/list/index.js b/examples/dist/list/index.js
@@ -77,7 +77,7 @@ Component({
             }
             this.triggerEvent('lintap', {
                 e
-            }, {})
+            }, { bubbles: true, composed: true })
         }
     }
 });
diff --git a/examples/dist/loadmore/index.js b/examples/dist/loadmore/index.js
@@ -31,8 +31,7 @@ Component({
   },
   methods: {
     onLoadmore(){
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch',{},{ bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
     }
   }
 });
diff --git a/examples/dist/mask/index.js b/examples/dist/mask/index.js
@@ -64,7 +64,7 @@ Component({
     onMaskTap(e) {
 
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({
diff --git a/examples/dist/notice-bar/index.js b/examples/dist/notice-bar/index.js
@@ -126,20 +126,18 @@ Component({
       }
     },
     handleTap() {
-      this.triggerEvent('lintap');
-      this.triggerEvent('lincatchtap', {}, { bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
       this.setData({
         timer: null
       });
     },
     onSwip(e){
       this.triggerEvent('lintap', {
         ...e.currentTarget.dataset
-      });
+      },{ bubbles: true, composed: true });
     },
     onIconTap(){
-      this.triggerEvent('linicontap');
-      this.triggerEvent('liniconcatchtap', {}, { bubbles: true });
+      this.triggerEvent('linicontap',{},{ bubbles: true, composed: true });
       this.setData({
         timer: null
       });
diff --git a/examples/dist/popup/index.js b/examples/dist/popup/index.js
@@ -54,7 +54,7 @@ Component({
     // 点击事件
     onPupopTap(e) {
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
       if (this.data.locked !== true) {
         this.setData({
           show: !this.data.show
diff --git a/examples/dist/segment/index.wxml b/examples/dist/segment/index.wxml
@@ -9,7 +9,7 @@
                     <template is="tab-item" data="{{item,activeKey,hasLine,activeColor,inactiveColor,aminmatedForLine}}" wx:else />
                     <view class="l-tab-line {{item.key===activeKey?'l-class-line':''}} {{aminmatedForLine?'l-line-aminmated':''}}" wx:if="{{hasLine}}" style="background:{{item.key===activeKey?activeColor:inactiveColor}}"></view>
                 </view>
-                <view wx:else id="{{item.key}}" class="l-tabs-item {{equalWidth?'l-tabs-equal-width':'l-tabs-unequal-width'}} {{item.key===activeKey ?'l-class-active l-tabs-active':'l-class-inactive l-tabs-inactive'}} {{'l-tab-image-placement-'+picPlacement}}" style="color:{{item.key===activeKey?activeColor:inactiveColor}}" data-key="{{item.key}}" data-index="{{index}}" bind:tap="handleChange">
+                <view wx:else id="key-{{item.key}}" class="l-tabs-item {{equalWidth?'l-tabs-equal-width':'l-tabs-unequal-width'}} {{item.key===activeKey ?'l-class-active l-tabs-active':'l-class-inactive l-tabs-inactive'}} {{'l-tab-image-placement-'+picPlacement}}" style="color:{{item.key===activeKey?activeColor:inactiveColor}}" data-key="{{item.key}}" data-index="{{index}}" bind:tap="handleChange">
                     <slot name="{{item.key}}"></slot>
                     <view class="l-tab-line {{item.key===activeKey?'l-class-line':''}} {{aminmatedForLine?'l-line-aminmated':''}}" wx:if="{{hasLine}}" style="background:{{item.key===activeKey?activeColor:inactiveColor}}"></view>
                 </view>
diff --git a/examples/dist/slide-view/index.js b/examples/dist/slide-view/index.js
@@ -156,7 +156,7 @@ Component({
     // 点击 右边区域
     onRightTap(e) {
       let detail = 'click right';
-      let option = {};
+      let option = { bubbles: true, composed: true };
       if (this.properties.autoClose) {
         this.setData({
           popup: false,
@@ -171,15 +171,15 @@ Component({
     // 打开后触发
     onOpenTap(e) {
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       this.triggerEvent('slideopen', detail, option);
     },
 
     // 关闭后触发
     onCloseTap(e) {
       let detail = false;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       this.triggerEvent('slideclose', detail, option);
     }
diff --git a/examples/dist/status-show/index.js b/examples/dist/status-show/index.js
@@ -89,8 +89,7 @@ Component({
     },
 
     onBtn() {
-      this.triggerEvent('lintap', {}, {});
-      this.triggerEvent('lintapcatch', {}, { bubbles: true });
+      this.triggerEvent('lintap', {}, { bubbles: true, composed: true });
     }
   }
 })
diff --git a/examples/dist/toast/index.js b/examples/dist/toast/index.js
@@ -218,7 +218,7 @@ Component({
     onMaskTap(e) {
 
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({
@@ -227,7 +227,7 @@ Component({
         })
       }
 
-      this.triggerEvent('linTap', detail, option);
+      this.triggerEvent('lintap', detail, option);
     }
   }
 })
diff --git a/src/action-sheet/index.js b/src/action-sheet/index.js
@@ -87,7 +87,7 @@ Component({
         success
       } = this.data;
       success && success({ ...e.currentTarget.dataset });
-      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset });
+      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 
@@ -112,7 +112,7 @@ Component({
       });
       this.triggerEvent('lincancel', {
         errMsg: 'showactionsheet:fail cancel'
-      });
+      },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 
diff --git a/src/badge/index.js b/src/badge/index.js
@@ -56,8 +56,7 @@ Component({
     },
     // 点击事件
     handleTap() {
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch', {}, { bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
     },
   }
 });
diff --git a/src/count-selector/index.js b/src/count-selector/index.js
@@ -67,7 +67,7 @@ Component({
         count: this.data.count,
         type: 'blur'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
 
     reduceTap() {
@@ -84,7 +84,7 @@ Component({
         count: this.data.count,
         type: 'reduce'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
 
     addTap() {
@@ -101,7 +101,7 @@ Component({
         count: this.data.count,
         type: 'add'
       }
-      this.triggerEvent('lintap', detail)
+      this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })
     },
   }
 })
diff --git a/src/custom-tab-bar/index.js b/src/custom-tab-bar/index.js
@@ -90,7 +90,7 @@ Component({
         idx,
         path:this.route
       };
-      let option = {};
+      let option = { bubbles: true, composed: true };
       this.triggerEvent('lintap', detail, option);
     },
     showRedDot(idx) {
diff --git a/src/dialog/index.js b/src/dialog/index.js
@@ -155,7 +155,7 @@ Component({
     onCancelTap(e) {
 
       let detail = 'cancel';
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       const {
         success
@@ -175,7 +175,7 @@ Component({
     // 背景点击事件
     onDialogTap(e) {
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({
diff --git a/src/grid-item/index.js b/src/grid-item/index.js
@@ -22,9 +22,7 @@ Component({
         tapGridItem(e) {
             this.triggerEvent('lintap', {
                 ...e
-            }, {
-                composed: true
-            })
+            }, { bubbles: true, composed: true })
         },
     }
 });
diff --git a/src/grid/index.js b/src/grid/index.js
@@ -70,7 +70,7 @@ Component({
         tapGrid(e) {
             this.triggerEvent('lintap', {
                 index:this.data.currentIndex
-            })
+            },{ bubbles: true, composed: true })
         }
     }
 });
diff --git a/src/list/index.js b/src/list/index.js
@@ -77,7 +77,7 @@ Component({
             }
             this.triggerEvent('lintap', {
                 e
-            }, {})
+            }, { bubbles: true, composed: true })
         }
     }
 });
diff --git a/src/loadmore/index.js b/src/loadmore/index.js
@@ -31,8 +31,7 @@ Component({
   },
   methods: {
     onLoadmore(){
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch',{},{ bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
     }
   }
 });
diff --git a/src/mask/index.js b/src/mask/index.js
@@ -64,7 +64,7 @@ Component({
     onMaskTap(e) {
 
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({
diff --git a/src/notice-bar/index.js b/src/notice-bar/index.js
@@ -126,20 +126,18 @@ Component({
       }
     },
     handleTap() {
-      this.triggerEvent('lintap');
-      this.triggerEvent('lincatchtap', {}, { bubbles: true });
+      this.triggerEvent('lintap',{},{ bubbles: true, composed: true });
       this.setData({
         timer: null
       });
     },
     onSwip(e){
       this.triggerEvent('lintap', {
         ...e.currentTarget.dataset
-      });
+      },{ bubbles: true, composed: true });
     },
     onIconTap(){
-      this.triggerEvent('linicontap');
-      this.triggerEvent('liniconcatchtap', {}, { bubbles: true });
+      this.triggerEvent('linicontap',{},{ bubbles: true, composed: true });
       this.setData({
         timer: null
       });
diff --git a/src/popup/index.js b/src/popup/index.js
diff --git a/src/segment/index.wxml b/src/segment/index.wxml
diff --git a/src/slide-view/index.js b/src/slide-view/index.js
diff --git a/src/status-show/index.js b/src/status-show/index.js
diff --git a/src/toast/index.js b/src/toast/index.js

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ Component({`
`67`	`67`	`count: this.data.count,`
`68`	`68`	`type: 'blur'`
`69`	`69`	`}`
`70`		`- this.triggerEvent('lintap', detail)`
	`70`	`+ this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })`
`71`	`71`	`},`
`72`	`72`
`73`	`73`	`reduceTap() {`
`@@ -84,7 +84,7 @@ Component({`
`84`	`84`	`count: this.data.count,`
`85`	`85`	`type: 'reduce'`
`86`	`86`	`}`
`87`		`- this.triggerEvent('lintap', detail)`
	`87`	`+ this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })`
`88`	`88`	`},`
`89`	`89`
`90`	`90`	`addTap() {`
`@@ -101,7 +101,7 @@ Component({`
`101`	`101`	`count: this.data.count,`
`102`	`102`	`type: 'add'`
`103`	`103`	`}`
`104`		`- this.triggerEvent('lintap', detail)`
	`104`	`+ this.triggerEvent('lintap', detail,{ bubbles: true, composed: true })`
`105`	`105`	`},`
`106`	`106`	`}`
`107`	`107`	`})`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ Component({`
`70`	`70`	`tapGrid(e) {`
`71`	`71`	`this.triggerEvent('lintap', {`
`72`	`72`	`index:this.data.currentIndex`
`73`		`- })`
	`73`	`+ },{ bubbles: true, composed: true })`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`});`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ Component({`
`77`	`77`	`}`
`78`	`78`	`this.triggerEvent('lintap', {`
`79`	`79`	`e`
`80`		`- }, {})`
	`80`	`+ }, { bubbles: true, composed: true })`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`});`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ Component({`
`31`	`31`	`},`
`32`	`32`	`methods: {`
`33`	`33`	`onLoadmore(){`
`34`		`- this.triggerEvent('lintap');`
`35`		`- this.triggerEvent('lintapcatch',{},{ bubbles: true });`
	`34`	`+ this.triggerEvent('lintap',{},{ bubbles: true, composed: true });`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`	`});`