From 80e7789bb41bfa609c7210d01e9ca8c06991e881 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 12 Dec 2019 20:49:56 +0800
Subject: [PATCH] build v3

---
 packages/uni-app-plus/dist/index.v3.js        | 74 +++++++++----------
 .../uni-template-compiler/__tests__/demo.js   |  4 +-
 .../lib/platforms/app-plus/index.js           | 10 +--
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/packages/uni-app-plus/dist/index.v3.js b/packages/uni-app-plus/dist/index.v3.js
index f5cb444c5..62d6b8b84 100644
--- a/packages/uni-app-plus/dist/index.v3.js
+++ b/packages/uni-app-plus/dist/index.v3.js
@@ -11434,6 +11434,40 @@ var serviceContext = (function () {
     return callHook(vm, hook, params)
   }
 
+  function onMessage (pageId, arg) {
+    pageId = parseInt(pageId);
+    const page = getCurrentPages(true).find(page => page.$page.id === pageId);
+    if (!page) {
+      return
+    }
+    if (!page.$page.meta.isNVue) {
+      const target = page.$vm._$vd.elements.find(target => target.tagName === 'web-view' && target.events['message']);
+      if (!target) {
+        return
+      }
+      target.dispatchEvent('message', {
+        type: 'message',
+        target: Object.create(null),
+        currentTarget: Object.create(null),
+        timeStamp: Date.now(),
+        detail: {
+          data: [arg]
+        }
+      });
+    }
+  }
+
+  function onWebInvokeAppService ({
+    name,
+    arg
+  }, pageIds) {
+    if (name === 'postMessage') {
+      onMessage(pageIds[0], arg);
+    } else {
+      uni[name](arg);
+    }
+  }
+
   function initOn (on, {
     getApp,
     getCurrentPages
@@ -11516,7 +11550,9 @@ var serviceContext = (function () {
 
     on('onNavigationBarSearchInputChanged', createCallCurrentPageHook('onNavigationBarSearchInputChanged'));
     on('onNavigationBarSearchInputConfirmed', createCallCurrentPageHook('onNavigationBarSearchInputConfirmed'));
-    on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked'));
+    on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked'));
+
+    on('onWebInvokeAppService', onWebInvokeAppService);
   }
 
   function initSubscribe (subscribe, {
@@ -11659,40 +11695,6 @@ var serviceContext = (function () {
     uni[method] && uni[method](args);
   }
 
-  function onMessage (pageId, arg) {
-    pageId = parseInt(pageId);
-    const page = getCurrentPages(true).find(page => page.$page.id === pageId);
-    if (!page) {
-      return
-    }
-    if (!page.$page.meta.isNVue) {
-      const target = page.$vm._$vd.elements.find(target => target.tagName === 'web-view' && target.events['message']);
-      if (!target) {
-        return
-      }
-      target.dispatchEvent('message', {
-        type: 'message',
-        target: Object.create(null),
-        currentTarget: Object.create(null),
-        timeStamp: Date.now(),
-        detail: {
-          data: [arg]
-        }
-      });
-    }
-  }
-
-  function onWebInvokeAppService ({
-    name,
-    arg
-  }, pageIds) {
-    if (name === 'postMessage') {
-      onMessage(pageIds[0], arg);
-    } else {
-      uni[name](arg);
-    }
-  }
-
   function onWxsInvokeCallMethod ({
     cid,
     method,
@@ -11758,8 +11760,6 @@ var serviceContext = (function () {
       emit('onWebInvokeAppService', data, webviewIds);
     });
 
-    on('onWebInvokeAppService', onWebInvokeAppService);
-
     subscribe('onWxsInvokeCallMethod', onWxsInvokeCallMethod);
 
     subscribe(VD_SYNC, onVdSync);
diff --git a/packages/uni-template-compiler/__tests__/demo.js b/packages/uni-template-compiler/__tests__/demo.js
index d32a40890..af51b9ee8 100644
--- a/packages/uni-template-compiler/__tests__/demo.js
+++ b/packages/uni-template-compiler/__tests__/demo.js
@@ -1,7 +1,7 @@
 const compiler = require('../lib')
 const res = compiler.compile(
   `
-<view data-a="1" :data-b="b"></view>
+<view class="custom-class"></view>
 `, {
     miniprogram: true,
     resourcePath: '/User/fxy/Documents/test.wxml',
@@ -15,7 +15,7 @@ const res = compiler.compile(
       platform: 'app-plus'
     },
     filterModules: ['swipe'],
-    service: true,
+    // service: true,
     view: true
 
   })
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index 576963c97..dcbe55504 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -21,9 +21,9 @@ const definePages = require('./define-pages')
 const appConfigService = require('./app-config-service')
 
 const wxPageOrientationMapping = {
-  auto: ["portrait-primary", "portrait-secondary", "landscape-primary", "landscape-secondary"],
-  portrait: ["portrait-primary", "portrait-secondary"],
-  landscape: ["landscape-primary", "landscape-secondary"]
+  auto: ['portrait-primary', 'portrait-secondary', 'landscape-primary', 'landscape-secondary'],
+  portrait: ['portrait-primary', 'portrait-secondary'],
+  landscape: ['landscape-primary', 'landscape-secondary']
 }
 
 function parseConfig (appJson) {
@@ -134,10 +134,10 @@ module.exports = function (pagesJson, userManifestJson) {
   }
 
   // 屏幕启动方向
-  if (manifestJson.plus.screenOrientation) {// app平台优先使用 manifest 配置
+  if (manifestJson.plus.screenOrientation) { // app平台优先使用 manifest 配置
     manifestJson.screenOrientation = manifestJson.plus.screenOrientation
     delete manifestJson.plus.screenOrientation
-  } else if (appJson.window && appJson.window.pageOrientation) {// 兼容微信小程序
+  } else if (appJson.window && appJson.window.pageOrientation) { // 兼容微信小程序
     const pageOrientationValue = wxPageOrientationMapping[appJson.window.pageOrientation]
     if (pageOrientationValue) {
       manifestJson.screenOrientation = pageOrientationValue
-- 
GitLab