Merge branch 'dev' of https://github.com/dcloudio/uni-app into dev-quickapp

packages/uni-app-plus/dist/index.v3.js

@@ -4037,7 +4037,6 @@ var serviceContext = (function () {
   var onBluetoothAdapterStateChange;
   var onBluetoothDeviceFound;
   var onBLEConnectionStateChange;
-  var onBLEConnectionStateChanged;
   var onBLECharacteristicValueChange;
 
   function openBluetoothAdapter (data, callbackId) {
@@ -4072,7 +4071,6 @@ var serviceContext = (function () {
 
   function createBLEConnection (data, callbackId) {
     onBLEConnectionStateChange = onBLEConnectionStateChange || bluetoothOn('onBLEConnectionStateChange');
-    onBLEConnectionStateChanged = onBLEConnectionStateChanged || bluetoothOn('onBLEConnectionStateChanged');
     bluetoothExec('createBLEConnection', callbackId, data);
   }
 
@@ -5925,7 +5923,8 @@ var serviceContext = (function () {
     const camera = plus.camera.getCamera();
     camera.captureImage(e => invokeChooseImage(callbackId, 'ok', sizeType, [e]),
       e => invokeChooseImage(callbackId, 'fail', 1), {
-        filename: TEMP_PATH + '/camera/'
+        filename: TEMP_PATH + '/camera/',
+        resolution: 'high'
       });
   };
   const openAlbum = function (callbackId, sizeType, count) {
@@ -13016,6 +13015,17 @@ var serviceContext = (function () {
     };
   }
 
+  /**
+   * mpvue event
+   */
+  function wrapperMPEvent (event) {
+    event.mp = Object.assign({
+      '@warning': 'mp is deprecated'
+    }, event);
+    event._processed = true;
+    return event
+  }
+
   const isAndroid = plus.os.name.toLowerCase() === 'android';
   const FOCUS_TIMEOUT = isAndroid ? 300 : 700;
   const HIDE_TIMEOUT = isAndroid ? 800 : 300;
@@ -13105,10 +13115,7 @@ var serviceContext = (function () {
     parseTargets(event);
     event.preventDefault = noop;
     event.stopPropagation = noop;
-    event.mp = event;
-    return Object.assign({
-      mp: event // mpvue
-    }, event)
+    return wrapperMPEvent(event)
   }
 
   const handleVdData = {

packages/uni-cli-shared/lib/index.js

@@ -22,7 +22,7 @@ const {
 } = require('./pages')
 
 const {
-  md5,
+  md5,
   hasOwn,
   hasModule,
   hashify,
@@ -56,12 +56,13 @@ const {
   htmlPreprocessOptions,
   nvueJsPreprocessOptions,
   nvueCssPreprocessOptions,
-  nvueHtmlPreprocessOptions
+  nvueHtmlPreprocessOptions,
+  getPlatformGlobal
 } = require('./platform')
 
 module.exports = {
   md5,
-  tags,
+  tags,
   hasOwn,
   getJson,
   parseJson,
@@ -104,5 +105,6 @@ module.exports = {
   htmlPreprocessOptions,
   nvueJsPreprocessOptions,
   nvueCssPreprocessOptions,
-  nvueHtmlPreprocessOptions
+  nvueHtmlPreprocessOptions,
+  getPlatformGlobal
 }

src/core/helpers/patch.js

@@ -6,10 +6,11 @@ import {
  * mpvue event
  */
 export function wrapperMPEvent (event) {
-  return Object.assign({
-    mp: event,
-    _processed: true
+  event.mp = Object.assign({
+    '@warning': 'mp is deprecated'
   }, event)
+  event._processed = true
+  return event
 }
 /**
  * app-plus titleNView
@@ -48,4 +49,4 @@ export function mergeTitleNView (navigationBar, titleNView) {
     }
   }
   return navigationBar
-}
+}

src/core/runtime/wrapper/util.js

@@ -291,6 +291,10 @@ function wrapper (event) {
     event.detail = {}
   }
 
+  if (!('markerId' in event.detail) && 'markerId' in event) {
+    event.detail.markerId = event.markerId
+  }
+
   if (__PLATFORM__ === 'mp-baidu') { // mp-baidu，checked=>value
     if (
       isPlainObject(event.detail) &&
@@ -485,18 +489,18 @@ export function handleEvent (event) {
             handlerCtx.$parent.$parent
           ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots
             handlerCtx = handlerCtx.$parent.$parent
-          }
-          if (methodName === '$emit') {
-            handlerCtx.$emit.apply(handlerCtx,
-              processEventArgs(
-                this.$vm,
-                event,
-                eventArray[1],
-                eventArray[2],
-                isCustom,
-                methodName
-              ))
-            return
+          }
+          if (methodName === '$emit') {
+            handlerCtx.$emit.apply(handlerCtx,
+              processEventArgs(
+                this.$vm,
+                event,
+                eventArray[1],
+                eventArray[2],
+                isCustom,
+                methodName
+              ))
+            return
           }
           const handler = handlerCtx[methodName]
           if (!isFn(handler)) {
@@ -528,4 +532,4 @@ export function handleEvent (event) {
   ) {
     return ret[0]
   }
-}
+}

src/platforms/app-plus/service/api/device/bluetooth.js

@@ -54,7 +54,6 @@ function bluetoothOn (method, beforeSuccess) {
 var onBluetoothAdapterStateChange
 var onBluetoothDeviceFound
 var onBLEConnectionStateChange
-var onBLEConnectionStateChanged
 var onBLECharacteristicValueChange
 
 export function openBluetoothAdapter (data, callbackId) {
@@ -89,7 +88,6 @@ export function getConnectedBluetoothDevices (data, callbackId) {
 
 export function createBLEConnection (data, callbackId) {
   onBLEConnectionStateChange = onBLEConnectionStateChange || bluetoothOn('onBLEConnectionStateChange')
-  onBLEConnectionStateChanged = onBLEConnectionStateChanged || bluetoothOn('onBLEConnectionStateChanged')
   bluetoothExec('createBLEConnection', callbackId, data)
 }
 

src/platforms/app-plus/service/api/media/choose-image.js

@@ -97,7 +97,8 @@ const openCamera = function (callbackId, sizeType) {
   const camera = plus.camera.getCamera()
   camera.captureImage(e => invokeChooseImage(callbackId, 'ok', sizeType, [e]),
     e => invokeChooseImage(callbackId, 'fail', 1), {
-      filename: TEMP_PATH + '/camera/'
+      filename: TEMP_PATH + '/camera/',
+      resolution: 'high'
     })
 }
 const openAlbum = function (callbackId, sizeType, count) {

src/platforms/app-plus/service/framework/plugins/vdom-sync.js

@@ -3,6 +3,10 @@ import {
   noop
 } from 'uni-shared'
 
+import {
+  wrapperMPEvent
+} from 'uni-helpers/patch'
+
 import {
   VD_SYNC,
   UI_EVENT,
@@ -55,10 +59,7 @@ function wrapperEvent (event) {
   parseTargets(event)
   event.preventDefault = noop
   event.stopPropagation = noop
-  event.mp = event
-  return Object.assign({
-    mp: event // mpvue
-  }, event)
+  return wrapperMPEvent(event)
 }
 
 const handleVdData = {

src/platforms/mp-alipay/runtime/wrapper/util.js

 import {
   isFn,
   cached,
-  camelize
+  camelize,
+  hasOwn
 } from 'uni-shared'
 
 import {
@@ -58,6 +59,12 @@ export function initSpecialMethods (mpInstance) {
     specialMethods.forEach(method => {
       if (isFn(mpInstance.$vm[method])) {
         mpInstance[method] = function (event) {
+          if (!hasOwn(event, 'detail')) {
+            event.detail = {}
+          }
+          if (!('markerId' in event.detail) && 'markerId' in event) {
+            event.detail.markerId = event.markerId
+          }
           // TODO normalizeEvent
           mpInstance.$vm[method](event)
         }
@@ -179,4 +186,4 @@ export const handleLink = (function () {
     // 支付宝通过 didMount 来实现，先子后父，故等父 ready 之后，统一初始化
     (this._$childVues || (this._$childVues = [])).unshift(detail)
   }
-})()
+})()