修复日志滚动逻辑

whyour · Sep 12, 2023 · 748a099 · 748a099
1 parent 742d0b2
commit 748a099
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
@@ -451,5 +451,6 @@
   "登录已过期，请重新登录": "Login session has expired, please log in again",
   "系统日志": "System Logs",
   "主题": "Theme",
-  "语言": "Language"
+  "语言": "Language",
+  "中...": "ing..."
 }
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
@@ -451,5 +451,6 @@
   "登录已过期，请重新登录": "登录已过期，请重新登录",
   "系统日志": "系统日志",
   "主题": "主题",
-  "语言": "语言"
+  "语言": "语言",
+  "中...": "中..."
 }
diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx
@@ -82,12 +82,12 @@ const CronLogModal = ({
     handleCancel();
   };
 
-  const handleScroll = (e) => {
-    const sTop = e.target.scrollTop;
+  const handleScroll: React.UIEventHandler<HTMLDivElement> = (e) => {
+    const sTop = (e.target as HTMLDivElement).scrollTop;
     if (scrollInfoRef.current.down) {
       scrollInfoRef.current = {
         value: sTop,
-        down: sTop > scrollInfoRef.current.value,
+        down: sTop > scrollInfoRef.current.value || !sTop,
       };
     }
   };
@@ -105,6 +105,7 @@ const CronLogModal = ({
   useEffect(() => {
     if (cron && cron.id && visible) {
       getCronLog(true);
+      scrollInfoRef.current.down = true;
     }
   }, [cron, visible]);
 

diff --git a/src/pages/setting/progress.tsx b/src/pages/setting/progress.tsx
@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import { Modal, Progress } from 'antd';
 import { useRef } from 'react';
 
@@ -15,14 +16,14 @@ export default function useProgress(title: string) {
   const showProgress = (percent: number) => {
     if (modalRef.current) {
       modalRef.current.update({
-        title: `${title}${percent >= 100 ? '成功' : '中...'}`,
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
         content: <ProgressElement percent={percent} />,
       });
     } else {
       modalRef.current = Modal.info({
         width: 600,
         maskClosable: false,
-        title: `${title}${percent >= 100 ? '成功' : '中...'}`,
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
         centered: true,
         content: <ProgressElement percent={percent} />,
       });