Merge pull request #285 from suilyy/sig

fix: 修改本地html数据切换不生效的问题

Author: HwangJianyi

.gitignore

@@ -62,3 +62,5 @@ msbuild.binlog
 example/msbuild.binlog
 
 *.tgz
+harmony/rn_webview/oh-package-lock.json5
+harmony/rn_webview/BuildProfile.ets

README.md

@@ -1,6 +1,6 @@
 # @react-native-oh-tpl/react-native-webview
 
-This project is based on [react-native-webview](https://github.com/react-native-webview/react-native-webview)
+This project is based on [react-native-webview@13.10.2](https://github.com/react-native-webview/react-native-webview/tree/v13.10.2)
 
 ## Documentation
 

harmony/rn_webview/oh-package.json5

@@ -8,6 +8,6 @@
   "main": "index.ets",
   "version": "13.10.3-rc.2",
   "dependencies": {
-    "@rnoh/react-native-openharmony": "0.72.59"
+    "@rnoh/react-native-openharmony": "^0.72.59"
   }
 }

harmony/rn_webview/src/main/ets/RNCWebView.ets

@@ -456,11 +456,11 @@ export struct RNCWebView {
   private onDescriptorWrapperChange(descriptorWrapper: WebViewDescriptor) {
     this.initVariable()
     this.descriptorWrapper = descriptorWrapper
-    if (this.html != "" && this.html != this.source.html) {
-      Logger.debug(TAG, "[RNOH] html is update")
-      this.html = this.source.html
+    if (this.source.html != "" && this.html != this.source.html) {
       if (this.controllerAttached) {
         this.loadHtmlData(this.source.html, this.source.baseUrl)
+        Logger.debug(TAG, "[RNOH] html is update")
+        this.html = this.source.html
       }
     } else if (this.url != this.source.uri) {
       if (this.source.uri != "") {
@@ -502,7 +502,7 @@ export struct RNCWebView {
         }
       })
     }
-    this.html = this.source.html
+    // this.html = this.source.html
     this.webviewWidth = this.descriptorWrapper.layoutMetrics.frame.size.width
     this.webviewHeight = this.descriptorWrapper.layoutMetrics.frame.size.height
     this.scrollEnabled = this.descriptorWrapper.rawProps.scrollEnabled;