Merge branch 'fix-subnvue' into dev

src/platforms/app-plus-nvue/services/api/sub-nvue.js

@@ -71,8 +71,14 @@ export function initSubNVue (nvue, plus, BroadcastChannel) {
 
     const maskColor = webview.__uniapp_mask
 
-    let maskWebview = plus.webview.getWebviewById(webview.__uniapp_mask_id)
-    maskWebview = maskWebview.parent() || maskWebview // 再次检测父
+    let maskWebview = webview.__uniapp_mask_id === '0' ? {
+      setStyle ({ mask }) {
+        nvue.requireModule('uni-tabview').setMask({
+          color: mask
+        })
+      }
+    } : plus.webview.getWebviewById(webview.__uniapp_mask_id)
+
     const oldShow = webview.show
     const oldHide = webview.hide
     const oldClose = webview.close
@@ -115,4 +121,4 @@ export function initSubNVue (nvue, plus, BroadcastChannel) {
       return getSubNVueById(plus.webview.currentWebview().id)
     }
   }
-}
+}

src/platforms/app-plus/runtime/api/sub-nvue.js

+import { requireNativePlugin } from './index'
+
 function wrapper (webview) {
   webview.$processed = true
 
@@ -19,8 +21,13 @@ function wrapper (webview) {
     return
   }
   const maskColor = webview.__uniapp_mask
-  let maskWebview = plus.webview.getWebviewById(webview.__uniapp_mask_id)
-  maskWebview = maskWebview.parent() || maskWebview// 再次检测父
+  let maskWebview = webview.__uniapp_mask_id === '0' ? {
+    setStyle ({ mask }) {
+      requireNativePlugin('uni-tabview').setMask({
+        color: mask
+      })
+    }
+  } : plus.webview.getWebviewById(webview.__uniapp_mask_id)
   const oldShow = webview.show
   const oldHide = webview.hide
   const oldClose = webview.close
@@ -56,4 +63,4 @@ export function getSubNVueById (id) {
     wrapper(webview)
   }
   return webview
-}
+}