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

aljangtze · Mar 27, 2019 · 8ec8952 · 8ec8952
2 parents 540d65e + 4a19265
commit 8ec8952
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
@@ -228,7 +228,11 @@ TODOS.forEach(function (name) {
   todoApis[name] = createTodoApi(name);
 });
 
-function requireNativePlugin (pluginName) {
+function requireNativePlugin (pluginName) {
+  /* eslint-disable no-undef */
+  if (typeof weex !== 'undefined') {
+    return weex.requireModule(pluginName)
+  }
   /* eslint-disable no-undef */
   return __requireNativePlugin__(pluginName)
 }

diff --git 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.204",
+	"version": "0.0.205",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
@@ -690,9 +690,9 @@ if (typeof Proxy !== 'undefined') {
         if (extraApi[name]) {
           return promisify(name, extraApi[name])
         }
-      }
-      if (todoApis[name]) {
-        return promisify(name, todoApis[name])
+        if (todoApis[name]) {
+          return promisify(name, todoApis[name])
+        }
       }
       if (!hasOwn(wx, name) && !hasOwn(protocols, name)) {
         return
@@ -703,11 +703,10 @@ if (typeof Proxy !== 'undefined') {
 } else {
   uni.upx2px = upx2px;
 
-  Object.keys(todoApis).forEach(name => {
-    uni[name] = promisify(name, todoApis[name]);
-  });
-
   {
+    Object.keys(todoApis).forEach(name => {
+      uni[name] = promisify(name, todoApis[name]);
+    });
     Object.keys(extraApi).forEach(name => {
       uni[name] = promisify(name, todoApis[name]);
     });

diff --git 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.914",
+	"version": "0.0.915",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/src/platforms/app-plus/service/api/index.js b/src/platforms/app-plus/service/api/index.js
@@ -1,4 +1,8 @@
-export function requireNativePlugin (pluginName) {
+export function requireNativePlugin (pluginName) {
+  /* eslint-disable no-undef */
+  if (typeof weex !== 'undefined') {
+    return weex.requireModule(pluginName)
+  }
   /* eslint-disable no-undef */
   return __requireNativePlugin__(pluginName)
 }
diff --git a/src/platforms/app-plus/service/api/require-native-plugin.js b/src/platforms/app-plus/service/api/require-native-plugin.js