From c368eea79ce985b9c487c4c415e0cef0def7ff82 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Thu, 5 Aug 2021 15:59:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(App):=20chooseLocation=E3=80=81Picker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-app-plus/src/helpers/page.ts                 | 8 +++++---
 .../src/service/api/location/chooseLocation.ts            | 5 +++--
 .../uni-app-plus/src/service/framework/page/register.ts   | 4 ++--
 .../uni-app-plus/src/view/components/picker/index.tsx     | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/uni-app-plus/src/helpers/page.ts b/packages/uni-app-plus/src/helpers/page.ts
index 21b8e20fc..917f16a9a 100644
--- a/packages/uni-app-plus/src/helpers/page.ts
+++ b/packages/uni-app-plus/src/helpers/page.ts
@@ -1,3 +1,5 @@
+import { extend } from '@vue/shared'
+
 declare interface BroadcastChannel {
   new (id: string): BroadcastChannel
   name: string
@@ -126,9 +128,9 @@ export function showPage({
     titleSize: '17px',
   }
   const pageId = `page${Date.now()}`
-  style = Object.assign({}, style)
+  style = extend({}, style)
   if (style.titleNView !== false && style.titleNView !== 'none') {
-    style.titleNView = Object.assign(titleNView, style.titleNView)
+    style.titleNView = extend(titleNView, style.titleNView)
   }
   const defaultStyle = {
     top: 0,
@@ -149,7 +151,7 @@ export function showPage({
       viewport: plus_.screen.resolutionWidth,
     },
   }
-  style = Object.assign(defaultStyle, style)
+  style = extend(defaultStyle, style)
   const page = plus_.webview.create('', pageId, style, {
     extras: {
       from: getPageId(),
diff --git a/packages/uni-app-plus/src/service/api/location/chooseLocation.ts b/packages/uni-app-plus/src/service/api/location/chooseLocation.ts
index da330fa9b..c3a080717 100644
--- a/packages/uni-app-plus/src/service/api/location/chooseLocation.ts
+++ b/packages/uni-app-plus/src/service/api/location/chooseLocation.ts
@@ -18,9 +18,10 @@ export const chooseLocation = <API_TYPE_CHOOSE_LOCATION>defineAsyncApi(
       url: '__uniappchooselocation',
       data: options,
       style: {
-        // @ts-ignore
+        // @ts-expect-error
         animationType: options.animationType || 'slide-in-bottom',
-        titleNView: undefined,
+        // @ts-expect-error
+        titleNView: false,
         popGesture: 'close',
         scrollIndicator: 'none',
       },
diff --git a/packages/uni-app-plus/src/service/framework/page/register.ts b/packages/uni-app-plus/src/service/framework/page/register.ts
index aadcb90f1..8b287c206 100644
--- a/packages/uni-app-plus/src/service/framework/page/register.ts
+++ b/packages/uni-app-plus/src/service/framework/page/register.ts
@@ -177,8 +177,8 @@ function createNVueVm(
       if (index > -1) {
         pages.splice(index, 1, vm)
       }
-      if ((webview as any).__preload__) {
-        ;(webview as any).__page__ = vm
+      if ((webview as PreloadWebviewObject).__preload__) {
+        ;(webview as PreloadWebviewObject).__page__ = vm
       }
     },
     $getAppWebview() {
diff --git a/packages/uni-app-plus/src/view/components/picker/index.tsx b/packages/uni-app-plus/src/view/components/picker/index.tsx
index dc2981336..dfd93329a 100644
--- a/packages/uni-app-plus/src/view/components/picker/index.tsx
+++ b/packages/uni-app-plus/src/view/components/picker/index.tsx
@@ -194,7 +194,8 @@ export default /*#__PURE__*/ defineBuiltInComponent({
         url: '__uniapppicker',
         data,
         style: {
-          titleNView: undefined,
+          // @ts-expect-error
+          titleNView: false,
           animationType: 'none',
           animationDuration: 0,
           background: 'rgba(0,0,0,0)',
-- 
GitLab