From e7be4999b0fa7a41146bec5198c3419e799b3868 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Fri, 25 Aug 2023 09:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/index.less              | 12 ++++++++--
 src/pages/crontab/logModal.tsx      |  4 ++--
 src/pages/dependence/logModal.tsx   | 34 +++++++++++++++--------------
 src/pages/subscription/logModal.tsx | 34 +++++++++++++++--------------
 4 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/layouts/index.less b/src/layouts/index.less
index ab1ddc44..f264ab19 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -39,8 +39,16 @@ body {
   .ant-modal-body {
     overflow-y: auto;
     min-height: 300px;
-    max-height: 80vh;
-    max-height: calc(80vh - var(--vh-offset, 0px));
+    max-height: calc(80vh - 110px);
+    max-height: calc(80vh - var(--vh-offset, 110px));
+    padding: 0;
+    display: flex;
+
+    .log-container {
+      width: 100%;
+      padding: 24px;
+      overflow-y: auto;
+    }
   }
 
   pre {
diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx
index 5f6c6c8b..0c28c2ff 100644
--- a/src/pages/crontab/logModal.tsx
+++ b/src/pages/crontab/logModal.tsx
@@ -50,8 +50,8 @@ const CronLogModal = ({
             log && !logEnded(log) && !log.includes('任务未运行'),
           );
           setExecuting(hasNext);
-          autoScroll();
           if (hasNext) {
+            autoScroll();
             setTimeout(() => {
               getCronLog();
             }, 2000);
@@ -74,7 +74,7 @@ const CronLogModal = ({
       document
         .querySelector('#log-flag')!
         .scrollIntoView({ behavior: 'smooth' });
-    }, 1000);
+    }, 600);
   };
 
   const cancel = () => {
diff --git a/src/pages/dependence/logModal.tsx b/src/pages/dependence/logModal.tsx
index f1a6761e..7d6a2986 100644
--- a/src/pages/dependence/logModal.tsx
+++ b/src/pages/dependence/logModal.tsx
@@ -130,22 +130,24 @@ const DependenceLogModal = ({
         </Button>,
       ]}
     >
-      {loading ? (
-        <PageLoading />
-      ) : (
-        <pre
-          style={
-            isPhone
-              ? {
-                  fontFamily: 'Source Code Pro',
-                  zoom: 0.83,
-                }
-              : {}
-          }
-        >
-          <Ansi>{value}</Ansi>
-        </pre>
-      )}
+      <div className="log-container">
+        {loading ? (
+          <PageLoading />
+        ) : (
+          <pre
+            style={
+              isPhone
+                ? {
+                    fontFamily: 'Source Code Pro',
+                    zoom: 0.83,
+                  }
+                : {}
+            }
+          >
+            <Ansi>{value}</Ansi>
+          </pre>
+        )}
+      </div>
     </Modal>
   );
 };
diff --git a/src/pages/subscription/logModal.tsx b/src/pages/subscription/logModal.tsx
index 49fce0c2..921fb4a6 100644
--- a/src/pages/subscription/logModal.tsx
+++ b/src/pages/subscription/logModal.tsx
@@ -108,22 +108,24 @@ const SubscriptionLogModal = ({
         </Button>,
       ]}
     >
-      {loading ? (
-        <PageLoading />
-      ) : (
-        <pre
-          style={
-            isPhone
-              ? {
-                  fontFamily: 'Source Code Pro',
-                  zoom: 0.83,
-                }
-              : {}
-          }
-        >
-          {value}
-        </pre>
-      )}
+      <div className="log-container">
+        {loading ? (
+          <PageLoading />
+        ) : (
+          <pre
+            style={
+              isPhone
+                ? {
+                    fontFamily: 'Source Code Pro',
+                    zoom: 0.83,
+                  }
+                : {}
+            }
+          >
+            {value}
+          </pre>
+        )}
+      </div>
     </Modal>
   );
 };