From 8308f87567a1522a73745313ec59be54b078bb3f Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 18 Apr 2019 15:00:04 +0800
Subject: [PATCH] build uni runtime $emit('input', $event.target.value)

---
 packages/uni-app-plus/dist/index.js   | 12 +++++++++---
 packages/uni-app-plus/package.json    |  2 +-
 packages/uni-mp-baidu/dist/index.js   | 12 +++++++++---
 packages/uni-mp-baidu/package.json    |  2 +-
 packages/uni-mp-toutiao/dist/index.js | 12 +++++++++---
 packages/uni-mp-toutiao/package.json  |  2 +-
 packages/uni-mp-weixin/dist/index.js  | 12 +++++++++---
 packages/uni-mp-weixin/package.json   |  2 +-
 src/core/runtime/wrapper/util.js      | 12 +++++++++---
 9 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
index 7277a4064..1bf747541 100644
--- a/packages/uni-app-plus/dist/index.js
+++ b/packages/uni-app-plus/dist/index.js
@@ -470,7 +470,7 @@ function getExtraValue (vm, dataPathsArray) {
   return context
 }
 
-function processEventExtra (vm, extra) {
+function processEventExtra (vm, extra, event) {
   const extraObj = {};
 
   if (Array.isArray(extra) && extra.length) {
@@ -490,7 +490,13 @@ function processEventExtra (vm, extra) {
         if (!dataPath) { // model,prop.sync
           extraObj['$' + index] = vm;
         } else {
-          extraObj['$' + index] = vm.__get_value(dataPath);
+          if (dataPath === '$event') { // $event
+            extraObj['$' + index] = event;
+          } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
+            extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event);
+          } else {
+            extraObj['$' + index] = vm.__get_value(dataPath);
+          }
         }
       } else {
         extraObj['$' + index] = getExtraValue(vm, dataPath);
@@ -524,7 +530,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
     }
   }
 
-  const extraObj = processEventExtra(vm, extra);
+  const extraObj = processEventExtra(vm, extra, event);
 
   const ret = [];
   args.forEach(arg => {
diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json
index d8415d980..b1df8791d 100644
--- a/packages/uni-app-plus/package.json
+++ b/packages/uni-app-plus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.219",
+	"version": "0.0.220",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js
index d0077c838..bff99602a 100644
--- a/packages/uni-mp-baidu/dist/index.js
+++ b/packages/uni-mp-baidu/dist/index.js
@@ -615,7 +615,7 @@ function getExtraValue (vm, dataPathsArray) {
   return context
 }
 
-function processEventExtra (vm, extra) {
+function processEventExtra (vm, extra, event) {
   const extraObj = {};
 
   if (Array.isArray(extra) && extra.length) {
@@ -635,7 +635,13 @@ function processEventExtra (vm, extra) {
         if (!dataPath) { // model,prop.sync
           extraObj['$' + index] = vm;
         } else {
-          extraObj['$' + index] = vm.__get_value(dataPath);
+          if (dataPath === '$event') { // $event
+            extraObj['$' + index] = event;
+          } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
+            extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event);
+          } else {
+            extraObj['$' + index] = vm.__get_value(dataPath);
+          }
         }
       } else {
         extraObj['$' + index] = getExtraValue(vm, dataPath);
@@ -669,7 +675,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
     }
   }
 
-  const extraObj = processEventExtra(vm, extra);
+  const extraObj = processEventExtra(vm, extra, event);
 
   const ret = [];
   args.forEach(arg => {
diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json
index aa2b959b8..fcae15a74 100644
--- a/packages/uni-mp-baidu/package.json
+++ b/packages/uni-mp-baidu/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-baidu",
-	"version": "0.0.814",
+	"version": "0.0.815",
 	"description": "uni-app mp-baidu",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js
index 5ee649a89..6350ea38d 100644
--- a/packages/uni-mp-toutiao/dist/index.js
+++ b/packages/uni-mp-toutiao/dist/index.js
@@ -650,7 +650,7 @@ function getExtraValue (vm, dataPathsArray) {
   return context
 }
 
-function processEventExtra (vm, extra) {
+function processEventExtra (vm, extra, event) {
   const extraObj = {};
 
   if (Array.isArray(extra) && extra.length) {
@@ -670,7 +670,13 @@ function processEventExtra (vm, extra) {
         if (!dataPath) { // model,prop.sync
           extraObj['$' + index] = vm;
         } else {
-          extraObj['$' + index] = vm.__get_value(dataPath);
+          if (dataPath === '$event') { // $event
+            extraObj['$' + index] = event;
+          } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
+            extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event);
+          } else {
+            extraObj['$' + index] = vm.__get_value(dataPath);
+          }
         }
       } else {
         extraObj['$' + index] = getExtraValue(vm, dataPath);
@@ -704,7 +710,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
     }
   }
 
-  const extraObj = processEventExtra(vm, extra);
+  const extraObj = processEventExtra(vm, extra, event);
 
   const ret = [];
   args.forEach(arg => {
diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json
index c126f963f..cbf535f2f 100644
--- a/packages/uni-mp-toutiao/package.json
+++ b/packages/uni-mp-toutiao/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-toutiao",
-	"version": "0.0.314",
+	"version": "0.0.315",
 	"description": "uni-app mp-toutiao",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
index 73114f3fe..9575a0e29 100644
--- a/packages/uni-mp-weixin/dist/index.js
+++ b/packages/uni-mp-weixin/dist/index.js
@@ -497,7 +497,7 @@ function getExtraValue (vm, dataPathsArray) {
   return context
 }
 
-function processEventExtra (vm, extra) {
+function processEventExtra (vm, extra, event) {
   const extraObj = {};
 
   if (Array.isArray(extra) && extra.length) {
@@ -517,7 +517,13 @@ function processEventExtra (vm, extra) {
         if (!dataPath) { // model,prop.sync
           extraObj['$' + index] = vm;
         } else {
-          extraObj['$' + index] = vm.__get_value(dataPath);
+          if (dataPath === '$event') { // $event
+            extraObj['$' + index] = event;
+          } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
+            extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event);
+          } else {
+            extraObj['$' + index] = vm.__get_value(dataPath);
+          }
         }
       } else {
         extraObj['$' + index] = getExtraValue(vm, dataPath);
@@ -551,7 +557,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
     }
   }
 
-  const extraObj = processEventExtra(vm, extra);
+  const extraObj = processEventExtra(vm, extra, event);
 
   const ret = [];
   args.forEach(arg => {
diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
index c3d1a22bc..c99796c58 100644
--- a/packages/uni-mp-weixin/package.json
+++ b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.938",
+	"version": "0.0.939",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js
index bd366d9fd..71316748b 100644
--- a/src/core/runtime/wrapper/util.js
+++ b/src/core/runtime/wrapper/util.js
@@ -176,7 +176,7 @@ function getExtraValue (vm, dataPathsArray) {
   return context
 }
 
-function processEventExtra (vm, extra) {
+function processEventExtra (vm, extra, event) {
   const extraObj = {}
 
   if (Array.isArray(extra) && extra.length) {
@@ -196,7 +196,13 @@ function processEventExtra (vm, extra) {
         if (!dataPath) { // model,prop.sync
           extraObj['$' + index] = vm
         } else {
-          extraObj['$' + index] = vm.__get_value(dataPath)
+          if (dataPath === '$event') { // $event
+            extraObj['$' + index] = event
+          } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
+            extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event)
+          } else {
+            extraObj['$' + index] = vm.__get_value(dataPath)
+          }
         }
       } else {
         extraObj['$' + index] = getExtraValue(vm, dataPath)
@@ -230,7 +236,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
     }
   }
 
-  const extraObj = processEventExtra(vm, extra)
+  const extraObj = processEventExtra(vm, extra, event)
 
   const ret = []
   args.forEach(arg => {
-- 
GitLab