From 09883feff5203b24578a1f2dac2f126a648f430a Mon Sep 17 00:00:00 2001
From: yinjiacheng <yinjiacheng@dcloud.io>
Date: Wed, 5 Jul 2023 18:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0web-view=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/web-view-local/web-view-local.uvue | 10 +++++-----
 pages/component/web-view/web-view.uvue             | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/component/web-view-local/web-view-local.uvue b/pages/component/web-view-local/web-view-local.uvue
index 3a37a738..341c720f 100644
--- a/pages/component/web-view-local/web-view-local.uvue
+++ b/pages/component/web-view-local/web-view-local.uvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="uni-flex-item">
-		<web-view ref="web-view" class="uni-flex-item" src="/hybrid/html/local.html" @onPostMessage="onPostMessage"
-			@error="error" @loading="loading" @loaded="loaded">
+		<web-view ref="web-view" class="uni-flex-item" src="/hybrid/html/local.html" @message="message" @error="error"
+			@loading="loading" @loaded="loaded">
 		</web-view>
 		<view class="uni-padding-wrap uni-common-mt">
 			<view class="uni-btn-v">
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-	import JSONObject from 'com.alibaba.fastjson.JSONObject';
 	export default {
 		data() {
 			return {
@@ -41,9 +40,10 @@
 			stop() {
 				(this.$refs['web-view'] as IWebViewNode).stop();
 			},
-			onPostMessage(event: WebViewPostMessageEvent) {
+			message(event: WebViewMessageEvent) {
 				console.log(JSON.stringify(event.detail));
-				const data = event.detail.data as JSONObject;
+				const data = event.detail.data;
+				if (data == null) return;
 				switch (data['action']) {
 					case 'navigateTo':
 						uni.navigateTo({
diff --git a/pages/component/web-view/web-view.uvue b/pages/component/web-view/web-view.uvue
index df8fdf44..2564f4fb 100644
--- a/pages/component/web-view/web-view.uvue
+++ b/pages/component/web-view/web-view.uvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="uni-flex-item">
-		<web-view ref="web-view" class="uni-flex-item" :src="src" :webview-styles="webview_styles"
-			@onPostMessage="onPostMessage" @error="error" @loading="loading" @loaded="loaded">
+		<web-view ref="web-view" class="uni-flex-item" :src="src" :webview-styles="webview_styles" @message="message"
+			@error="error" @loading="loading" @loaded="loaded">
 		</web-view>
 		<view class="uni-padding-wrap uni-common-mt">
 			<view class="uni-btn-v">
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-	import JSONObject from 'com.alibaba.fastjson.JSONObject';
 	export default {
 		data() {
 			return {
@@ -46,9 +45,10 @@
 			stop() {
 				(this.$refs['web-view'] as IWebViewNode).stop();
 			},
-			onPostMessage(event: WebViewPostMessageEvent) {
+			message(event: WebViewMessageEvent) {
 				console.log(JSON.stringify(event.detail));
-				const data = event.detail.data as JSONObject;
+				const data = event.detail.data;
+				if (data == null) return;
 				switch (data['action']) {
 					case 'navigateTo':
 						uni.navigateTo({
-- 
GitLab