From 6f26e3d56a48411a2bc927ba367df352dc33c761 Mon Sep 17 00:00:00 2001
From: liuyi <liuyi@dtstack.com>
Date: Mon, 2 Dec 2024 17:26:17 +0800
Subject: [PATCH 1/2] fix: #41 scroll to get next page data

---
 src/pages/article/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/article/index.tsx b/src/pages/article/index.tsx
index ee5dd62..57c6f49 100644
--- a/src/pages/article/index.tsx
+++ b/src/pages/article/index.tsx
@@ -112,7 +112,7 @@ const Article = (data) => {
         // 内容高度，180 是移动端顶部内容，318 是移动端名称图片内容，80 是 PC 端顶部内容，226 是 PC 端名称图片内容
         const contentHeight =  mobile ? (document.getElementById('articleContent')?.offsetHeight + 180 + 318) : (document.getElementById('articleContent')?.offsetHeight + 80 + 226)
 
-        if (hasMore && (scrollTop + windowHeight >= contentHeight)) {
+        if (hasMore && (scrollTop + windowHeight + 5 >= contentHeight)) {
             console.log('下一页')
             handleNext()
         }

From c4d9fe201820c5b07899026335f7f60c5019e4f7 Mon Sep 17 00:00:00 2001
From: liuyi <liuyi@dtstack.com>
Date: Mon, 2 Dec 2024 17:28:41 +0800
Subject: [PATCH 2/2] ci: not use node_modules cache

---
 .github/workflows/CI.yml | 124 +++++++++------------------------------
 1 file changed, 29 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 27009e8..b75fce2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,100 +1,34 @@
 name: CI
 
 on:
-  push:
-    branches: [feat_*, dev]
-  pull_request:
-    branches: [master, dev]
+    push:
+        branches: "master"
+    pull_request:
+        branches: "*"
 
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: 'Set pnpm'
-        uses: pnpm/action-setup@v4.0.0
-        with:
-          version: 6.32.20
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14.x
-          cache: pnpm
-
-      - name: Cache pnpm-lock.yaml
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: Hack for single file
-        run: |
-          if [ ! -d "package-temp-dir" ]; then
-            mkdir package-temp-dir
-          fi
-          cp pnpm-lock.yaml package-temp-dir
-      - name: Cache node_modules
-        id: node_modules_cache_id
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-temp-dir/pnpm-lock.yaml') }}
-
-      - name: Install dependencies
-        if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
-        run: pnpm install
-
-  lint:
-    needs: [setup]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: 'Set pnpm'
-        uses: pnpm/action-setup@v4.0.0
-        with:
-          version: 6.32.20
-
-      - name: Restore cache from pnpm-lock.yaml
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: Restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-temp-dir/pnpm-lock.yaml') }}
-
-      - name: Run lint
-        run: pnpm run lint
-
-  build:
-    runs-on: ubuntu-latest
-    needs: [setup, lint]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: 'Set pnpm'
-        uses: pnpm/action-setup@v4.0.0
-        with:
-          version: 6.32.20
-
-      - name: Restore cache from pnpm-lock.yaml
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: Restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-temp-dir/pnpm-lock.yaml') }}
-
-      - name: Build test
-        run: pnpm run build
+    setup:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+
+            - name: "Set pnpm"
+              uses: pnpm/action-setup@v4.0.0
+              with:
+                  version: 6.32.20
+
+            - name: Setup node
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 14.x
+                  cache: pnpm
+
+            - name: Install dependencies
+              run: pnpm install
+
+            - name: Run lint
+              run: pnpm run lint
+
+            - name: Build test
+              run: pnpm run build