Merge commit '4251ebf7' into alpha-publish

packages/uni-template-compiler/lib/module.js

@@ -10,7 +10,10 @@ function removeAttr (el, name) {
 module.exports = {
   preTransformNode (el, {
     warn
-  }) {
+  }) {
+    if (process.env.UNI_PLATFORM === 'app-plus' && el.tag === 'ad') {
+      warn("app-vue平台, <ad> 组件暂不支持非 V3 编译, 详见: https://ask.dcloud.net.cn/article/36599")
+    }
     if (el.tag === 'slot' && !el.attrsMap['name']) {
       el.attrsList.push({
         name: 'SLOT_DEFAULT',

src/core/service/api/context/create-map-context.js

@@ -34,6 +34,10 @@ export class MapContext {
     operateMapPlayer(this.id, this.pageVm, 'includePoints', args)
   }
 }
+
+MapContext.prototype.$getAppMap = function() {
+  return plus.maps.getMapById(this.pageVm.$page.id + '-map-' + this.id);
+}
 
 methods.forEach(function (method) {
   MapContext.prototype[method] = callback.warp(function (options, callbackId) {

src/platforms/app-plus/view/components/map/index.vue

@@ -188,7 +188,7 @@ export default {
     if (this.latitude && this.longitude) {
       mapStyle.center = new plus.maps.Point(this.longitude, this.latitude)
     }
-    const map = this.map = plus.maps.create('map' + Date.now(), mapStyle)
+    const map = this.map = plus.maps.create(this.$page.id + '-map-' + (this.id || Date.now()), mapStyle)
     map.__markers__ = {}
     map.__lines__ = []
     map.__circles__ = []