fix(cli): fix bind missing a ":"

fix #2497
Tencent · Feb 9, 2020 · 4fd87d2 · 4fd87d2 · Asces · Apr 1, 2020
1 parent f5fb220
commit 4fd87d2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/packages/cli/core/plugins/template/directives/v-on.js b/packages/cli/core/plugins/template/directives/v-on.js
@@ -75,7 +75,7 @@ const parseHandler = (name = '', value = '', scope) => {
   info = parseHandlerProxy(value, scope);
 
   if (name === 'click') name = 'tap';
-  type = 'bind' + name;
+  type = 'bind:' + name;
   return {
     event: name,
     type: type,
@@ -93,7 +93,7 @@ exports = module.exports = function() {
 
   this.register('template-parse-ast-attr-v-on.capture', function({ item, name, expr, event, scope, ctx }) {
     // bind:tap="xxx" or catch:tap="xxx"
-    event.type = event.type.replace(/^bind/, 'bind:').replace(/^catch/, 'catch:');
+    event.type = event.type.replace(/^bind/, 'bind').replace(/^catch/, 'catch');
     event.type = 'capture-' + event.type;
     return { item, name, expr, event, scope, ctx };
   });

diff --git a/packages/cli/test/core/fixtures/template/assert/v-on.wxml b/packages/cli/test/core/fixtures/template/assert/v-on.wxml
@@ -1,14 +1,16 @@
-<view data-wpy-evt="0-0" bindtap="_proxy"></view>
-<view data-wpy-evt="0-1" catchtap="_proxy"></view>
+<view data-wpy-evt="0-0" bind:tap="_proxy"></view>
+<view data-wpy-evt="0-1" catch:tap="_proxy"></view>
 <view data-wpy-evt="0-2" capture-bind:tap="_proxy"></view>
 <view data-wpy-evt="0-3" capture-catch:tap="_proxy"></view>
 <view data-wpy-evt="0-4" capture-catch:tap="_proxy"></view>
 
-<view data-wpy-evt="0-5" bindtap="_proxy"></view>
+<view data-wpy-evt="0-5" bind:tap="_proxy"></view>
 
 <view wx:for="{{ list }}" wx:for-index="index" wx:for-item="item" wx:key="index">
-  <button data-wpy-evt="0-6" bindtap="_proxy" data-wpytap-a="{{ item }}"></button>
+  <button data-wpy-evt="0-6" bind:tap="_proxy" data-wpytap-a="{{ item }}"></button>
 </view>
 
 <view data-wpy-evt="0-7" capture-bind:tap="_proxy"></view>
 <view data-wpy-evt="0-8" capture-catch:tap="_proxy"></view>
+
+<view data-wpy-evt="0-9" bind:click-right="_proxy"></view>
diff --git a/packages/cli/test/core/fixtures/template/assert/v-on.wxs.wxml b/packages/cli/test/core/fixtures/template/assert/v-on.wxs.wxml
@@ -1,2 +1,2 @@
-<view bindtap="{{ m.touchmove }}"></view>
-<view data-wpy-evt="0-0" bindtap="_proxy"></view>
+<view bind:tap="{{ m.touchmove }}"></view>
+<view data-wpy-evt="0-0" bind:tap="_proxy"></view>
diff --git a/packages/cli/test/core/fixtures/template/assert/v-on/0-9.click-right.js b/packages/cli/test/core/fixtures/template/assert/v-on/0-9.click-right.js
@@ -0,0 +1,7 @@
+function proxy() {
+  var $event = arguments[arguments.length - 1];
+  var _vm = this;
+  return (function() {
+    _vm.rightNavbar($event);
+  })();
+}
diff --git a/packages/cli/test/core/fixtures/template/original/v-on.html b/packages/cli/test/core/fixtures/template/original/v-on.html
@@ -12,3 +12,5 @@
 
 <div capture-bind:tap="handleCaptureBindTap"></div>
 <div capture-catch:tap="handleCaptureCatchTap"></div>
+
+<div @click-right="rightNavbar"></div>