feat: uni.webview.js 支持 uni x

yangyuanxx · Jul 3, 2023 · 310bb49 · 310bb49
1 parent ca62d04
commit 310bb49
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/build/rollup.config.web-view.js b/build/rollup.config.web-view.js
@@ -6,7 +6,7 @@ module.exports = {
   input: 'src/core/runtime/web-view/index.js',
   output: {
     name: 'uni',
-    file: 'dist/uni.webview.1.5.4.js',
+    file: 'dist/uni.webview.1.5.5.js',
     format: 'umd'
   },
   plugins: [

diff --git a/dist/uni.webview.1.5.5.js b/dist/uni.webview.1.5.5.js
diff --git a/src/platforms/app-plus/runtime/web-view-api.js b/src/platforms/app-plus/runtime/web-view-api.js
@@ -7,6 +7,10 @@ function isNvue () {
   return (window.__dcloud_weex_postMessage || window.__dcloud_weex_)
 }
 
+function isUvue () {
+  return (window.__uniapp_x_postMessage || window.__uniapp_x_)
+}
+
 const publish = function (method, params) {
   const paramsObj = {
     options: {
@@ -16,6 +20,33 @@ const publish = function (method, params) {
     arg: params
   }
 
+  if (isUvue()) { // uvue web-view
+    if (method === 'postMessage') {
+      const message = {
+        data: [params]
+      }
+      if (window.__uniapp_x_postMessage) {
+        return window.__uniapp_x_postMessage(message)
+      } else {
+        return window.__uniapp_x_.postMessage(JSON.stringify(message))
+      }
+    }
+
+    const serviceMessage = {
+      type: WEB_INVOKE_APPSERVICE,
+      args: {
+        data: paramsObj,
+        webviewIds
+      }
+    }
+    if (window.__uniapp_x_postMessage) {
+      window.__uniapp_x_postMessageToService(serviceMessage)
+    } else {
+      window.__uniapp_x_.postMessageToService(JSON.stringify(serviceMessage))
+    }
+    return
+  }
+
   if (isNvue()) { // nvue web-view
     if (method === 'postMessage') {
       const message = {
@@ -40,6 +71,7 @@ const publish = function (method, params) {
     } else {
       window.__dcloud_weex_.postMessageToService(JSON.stringify(serviceMessage))
     }
+    return
   }
 
   if (!window.plus) { // h5 web-view