From ec985cfc33a6428cf6f4e5437b94aed11054541a Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Sat, 22 May 2021 13:47:18 +0800
Subject: [PATCH 1/4] build(workflows): add lint & build

---
 .github/workflows/test.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..a55da158e
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,32 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+
+    - name: Install dependencies
+      uses: bahmutov/npm-install@v1
+
+    - name: Run linter
+      run: npm run lint
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+
+    - name: Install dependencies
+      uses: bahmutov/npm-install@v1
+
+    - name: Build
+      run: npm run build

From 51bc6fa837cdb4e7d24c6d9af9510c761806bc7f Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Sat, 22 May 2021 13:54:52 +0800
Subject: [PATCH 2/4] build(workflows): build:lib

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a55da158e..381c24d04 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,4 +29,4 @@ jobs:
       uses: bahmutov/npm-install@v1
 
     - name: Build
-      run: npm run build
+      run: npm run build:lib

From 1ec7e768c584c524213b9bbe297384af7f368cbe Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Wed, 4 Aug 2021 21:13:17 +0800
Subject: [PATCH 3/4] feat(Overlay): add lock-scroll prop

---
 packages/overlay/README.md  | 15 ++++++++-------
 packages/overlay/index.ts   |  4 ++++
 packages/overlay/index.wxml | 11 +++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/overlay/README.md b/packages/overlay/README.md
index a29fcdf9f..723591b00 100644
--- a/packages/overlay/README.md
+++ b/packages/overlay/README.md
@@ -87,13 +87,14 @@ Page({
 
 ### Props
 
-| 参数         | 说明             | 类型               | 默认值  | 版本 |
-| ------------ | ---------------- | ------------------ | ------- | ---- |
-| show         | 是否展示遮罩层   | _boolean_          | `false` | -    |
-| z-index      | z-index 层级     | _string \| number_ | `1`     | -    |
-| duration     | 动画时长，单位秒 | _string \| number_ | `0.3`   | -    |
-| class-name   | 自定义类名       | _string_           | -       | -    |
-| custom-style | 自定义样式       | _string_           | -       | -    |
+| 参数                | 说明                                             | 类型               | 默认值  |
+| ------------        | ------------------------------------------------ | ------------------ | ------- |
+| show                | 是否展示遮罩层                                   | _boolean_          | `false` |
+| z-index             | z-index 层级                                     | _string \| number_ | `1`     |
+| duration            | 动画时长，单位秒                                 | _string \| number_ | `0.3`   |
+| class-name          | 自定义类名                                       | _string_           | -       |
+| custom-style        | 自定义样式                                       | _string_           | -       |
+| lock-scroll `1.7.3` | 是否锁定背景滚动，锁定时蒙层里的内容也将无法滚动 | _boolean_          | true    |
 
 ### Events
 
diff --git a/packages/overlay/index.ts b/packages/overlay/index.ts
index 80f5103f7..0fdfa7775 100644
--- a/packages/overlay/index.ts
+++ b/packages/overlay/index.ts
@@ -12,6 +12,10 @@ VantComponent({
       type: Number,
       value: 1,
     },
+    lockScroll: {
+      type: Boolean,
+      value: true,
+    },
   },
 
   methods: {
diff --git a/packages/overlay/index.wxml b/packages/overlay/index.wxml
index 9212348b0..4044a18a7 100644
--- a/packages/overlay/index.wxml
+++ b/packages/overlay/index.wxml
@@ -5,6 +5,17 @@
   duration="{{ duration }}"
   bind:tap="onClick"
   catch:touchmove="noop"
+  wx:if="{{ lockScroll }}"
+>
+  <slot></slot>
+</van-transition>
+<van-transition
+  show="{{ show }}"
+  custom-class="van-overlay"
+  custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
+  duration="{{ duration }}"
+  bind:tap="onClick"
+  wx:else
 >
   <slot></slot>
 </van-transition>

From a31bd6f6a5f977e57d890d552a6d58822715eb45 Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Thu, 5 Aug 2021 13:59:47 +0800
Subject: [PATCH 4/4] style(Overlay): adjust order

---
 packages/overlay/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/overlay/index.wxml b/packages/overlay/index.wxml
index 4044a18a7..92734a0c8 100644
--- a/packages/overlay/index.wxml
+++ b/packages/overlay/index.wxml
@@ -1,21 +1,21 @@
 <van-transition
+  wx:if="{{ lockScroll }}"
   show="{{ show }}"
   custom-class="van-overlay"
   custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
   duration="{{ duration }}"
   bind:tap="onClick"
   catch:touchmove="noop"
-  wx:if="{{ lockScroll }}"
 >
   <slot></slot>
 </van-transition>
 <van-transition
+  wx:else
   show="{{ show }}"
   custom-class="van-overlay"
   custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
   duration="{{ duration }}"
   bind:tap="onClick"
-  wx:else
 >
   <slot></slot>
 </van-transition>