From 653ace97d2cd4ddf0db347362c056850b8ed9778 Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Tue, 25 Jan 2022 11:53:00 +0800 Subject: [PATCH] feat(app): page style add disableSwipeBack param --- packages/shims-uni-app.d.ts | 2 ++ packages/uni-cli-shared/src/json/pages.ts | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/packages/shims-uni-app.d.ts b/packages/shims-uni-app.d.ts index fa8656377..c4190d8ab 100644 --- a/packages/shims-uni-app.d.ts +++ b/packages/shims-uni-app.d.ts @@ -202,6 +202,8 @@ declare namespace UniApp { animationType?: string animationDuration?: number subNVues?: PagesJsonPageStyleSubNVue[] + disableSwipeBack?: Boolean + popGesture?: 'close' | 'none' } interface PageRouteMeta extends PagesJsonPageStyle { id?: number diff --git a/packages/uni-cli-shared/src/json/pages.ts b/packages/uni-cli-shared/src/json/pages.ts index b10a7538b..89502703a 100644 --- a/packages/uni-cli-shared/src/json/pages.ts +++ b/packages/uni-cli-shared/src/json/pages.ts @@ -199,6 +199,12 @@ function normalizePageStyle( pageStyle.enablePullDownRefresh = true pageStyle.pullToRefresh = normalizePullToRefresh(pageStyle) } + if (platform === 'app') { + pageStyle.disableSwipeBack === true + ? (pageStyle.popGesture = 'none') + : delete pageStyle.popGesture + delete pageStyle.disableSwipeBack + } } pageStyle.isNVue = isNVue removePlatformStyle(pageStyle) -- GitLab