From 55bb442b57072723308922583ebb87d2b9bcaf1b Mon Sep 17 00:00:00 2001 From: houlinfeng Date: Fri, 27 Sep 2024 15:20:03 +0800 Subject: [PATCH 1/3] feat: delete other file --- projects/web_demo/web_demo/config/mineru_web.db | Bin 12288 -> 0 bytes .../web_demo/node_modules/.yarn-integrity | 10 ---------- projects/web_demo/web_demo/yarn.lock | 4 ---- 3 files changed, 14 deletions(-) delete mode 100644 projects/web_demo/web_demo/config/mineru_web.db delete mode 100644 projects/web_demo/web_demo/node_modules/.yarn-integrity delete mode 100644 projects/web_demo/web_demo/yarn.lock diff --git a/projects/web_demo/web_demo/config/mineru_web.db b/projects/web_demo/web_demo/config/mineru_web.db deleted file mode 100644 index fcac36060408e8c406a56b338c239853183f09b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI#O;5rw7zglem=H-Y-nc%AAwWWmFBfk*uu>!6+VZLFd|`rt8`jk)~;etQlFCMUD5C1Nqfg z`ag9I?fCLDFSADeT|4-Y4GIJx009U<00Izz00bZa0SIgnn4K8eLb0gNj|A^VJ|FUE znuLiv_JY-ZrfxISVdR)Ki_vO^%DMf}qejbNH_WD1+o9HzWmPG+AB2(b4*9?*hrKvy zWD-Z~fiV}aX(SO`Op@h#>ZfjZ^yY@cV3f`ocy1I9`?5(y8Vn{;nky z`u;RM!zQCz!4=c7PtT@Zzcuah>Dfg^S;?Cl^ Date: Fri, 27 Sep 2024 15:21:00 +0800 Subject: [PATCH 2/3] feat: init db --- projects/web_demo/web_demo/config/mineru_web.db | Bin 0 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 projects/web_demo/web_demo/config/mineru_web.db diff --git a/projects/web_demo/web_demo/config/mineru_web.db b/projects/web_demo/web_demo/config/mineru_web.db new file mode 100644 index 0000000000000000000000000000000000000000..fcac36060408e8c406a56b338c239853183f09b5 GIT binary patch literal 12288 zcmeI#O;5rw7zglem=H-Y-nc%AAwWWmFBfk*uu>!6+VZLFd|`rt8`jk)~;etQlFCMUD5C1Nqfg z`ag9I?fCLDFSADeT|4-Y4GIJx009U<00Izz00bZa0SIgnn4K8eLb0gNj|A^VJ|FUE znuLiv_JY-ZrfxISVdR)Ki_vO^%DMf}qejbNH_WD1+o9HzWmPG+AB2(b4*9?*hrKvy zWD-Z~fiV}aX(SO`Op@h#>ZfjZ^yY@cV3f`ocy1I9`?5(y8Vn{;nky z`u;RM!zQCz!4=c7PtT@Zzcuah>Dfg^S;?Cl^ Date: Fri, 27 Sep 2024 15:33:57 +0800 Subject: [PATCH 3/3] feat: style --- projects/web/src/components/SaveStatus.tsx | 25 +++++++++++++------ .../components/extractor-queue/index.tsx | 8 ++++-- .../extract/components/md-viewer/index.tsx | 1 + 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/projects/web/src/components/SaveStatus.tsx b/projects/web/src/components/SaveStatus.tsx index 80cadd51..75c8a3ee 100644 --- a/projects/web/src/components/SaveStatus.tsx +++ b/projects/web/src/components/SaveStatus.tsx @@ -4,6 +4,7 @@ import React, { useImperativeHandle, forwardRef, } from "react"; +import cls from "classnames"; interface SaveStatusProps { className?: string; @@ -18,7 +19,7 @@ const SaveStatus = forwardRef( ({ className }, ref) => { const [lastSaveTime, setLastSaveTime] = useState(null); const [showSaved, setShowSaved] = useState(false); - const [timeSinceLastSave, setTimeSinceLastSave] = useState(""); + const [timeSinceLastSave, setTimeSinceLastSave] = useState(0); useImperativeHandle(ref, () => ({ triggerSave: () => { @@ -29,7 +30,7 @@ const SaveStatus = forwardRef( // 新增的重置方法 setLastSaveTime(null); setShowSaved(false); - setTimeSinceLastSave(""); + setTimeSinceLastSave(0); }, })); @@ -50,7 +51,7 @@ const SaveStatus = forwardRef( (now.getTime() - lastSaveTime.getTime()) / 60000 ); if (diffInMinutes > 0) { - setTimeSinceLastSave(`${diffInMinutes} 分钟前`); + setTimeSinceLastSave(diffInMinutes); } } }; @@ -61,10 +62,20 @@ const SaveStatus = forwardRef( }, [lastSaveTime]); return ( -
- {showSaved && 已保存} - {!showSaved && lastSaveTime && ( - 最近修改:{timeSinceLastSave} +
+ {showSaved && ( + + 已保存 + + )} + {timeSinceLastSave > 0 && !showSaved && lastSaveTime && ( + + 最近修改:{timeSinceLastSave} 分钟前 + + )} + {(showSaved || + (timeSinceLastSave > 0 && !showSaved && lastSaveTime)) && ( + )}
); diff --git a/projects/web/src/pages/extract/components/extractor-queue/index.tsx b/projects/web/src/pages/extract/components/extractor-queue/index.tsx index 00aa12e2..cd557c90 100644 --- a/projects/web/src/pages/extract/components/extractor-queue/index.tsx +++ b/projects/web/src/pages/extract/components/extractor-queue/index.tsx @@ -69,7 +69,11 @@ const ExtractorQueue: React.FC = ({ className }) => { clearTimeout(timeout); } timeout = setTimeout(() => { - handleExtractor(nextJob?.type, nextJob?.id); + if (nextJob?.id) { + handleExtractor(nextJob?.type as any, nextJob?.id); + } else { + navigate("/OpenSourceTools/Extractor"); + } }, 10); }; const taskListRef = useLatest(taskList); @@ -82,7 +86,7 @@ const ExtractorQueue: React.FC = ({ className }) => { id: taskData?.id, type: taskData?.type, state: taskData?.state, // 提取状态 - }, + } as any, ].concat(taskListRef?.current) ); }; diff --git a/projects/web/src/pages/extract/components/md-viewer/index.tsx b/projects/web/src/pages/extract/components/md-viewer/index.tsx index b0e51ff3..5c708b5a 100644 --- a/projects/web/src/pages/extract/components/md-viewer/index.tsx +++ b/projects/web/src/pages/extract/components/md-viewer/index.tsx @@ -170,6 +170,7 @@ const MdViewer: React.FC = ({ ))} + {displayType === "code" && ( <>