Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 删除无用的文件,更新前端style #669

Merged
merged 4 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions projects/web/src/components/SaveStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, {
useImperativeHandle,
forwardRef,
} from "react";
import cls from "classnames";

interface SaveStatusProps {
className?: string;
Expand All @@ -18,7 +19,7 @@ const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
({ className }, ref) => {
const [lastSaveTime, setLastSaveTime] = useState<Date | null>(null);
const [showSaved, setShowSaved] = useState(false);
const [timeSinceLastSave, setTimeSinceLastSave] = useState("");
const [timeSinceLastSave, setTimeSinceLastSave] = useState(0);

useImperativeHandle(ref, () => ({
triggerSave: () => {
Expand All @@ -29,7 +30,7 @@ const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
// 新增的重置方法
setLastSaveTime(null);
setShowSaved(false);
setTimeSinceLastSave("");
setTimeSinceLastSave(0);
},
}));

Expand All @@ -50,7 +51,7 @@ const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
(now.getTime() - lastSaveTime.getTime()) / 60000
);
if (diffInMinutes > 0) {
setTimeSinceLastSave(`${diffInMinutes} 分钟前`);
setTimeSinceLastSave(diffInMinutes);
}
}
};
Expand All @@ -61,10 +62,20 @@ const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
}, [lastSaveTime]);

return (
<div className={className}>
{showSaved && <span>已保存</span>}
{!showSaved && lastSaveTime && (
<span>最近修改:{timeSinceLastSave}</span>
<div className={cls("flex items-center", className)}>
{showSaved && (
<span className="text-[#121316]/[0.6] text-[13px] leading-[24px]">
已保存
</span>
)}
{timeSinceLastSave > 0 && !showSaved && lastSaveTime && (
<span className="text-[#121316]/[0.6] text-[13px] leading-[24px]">
最近修改:{timeSinceLastSave} 分钟前
</span>
)}
{(showSaved ||
(timeSinceLastSave > 0 && !showSaved && lastSaveTime)) && (
<span className="w-[1px] h-[0.75rem] bg-[#D7D8DD] ml-[1rem] block"></span>
)}
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ const ExtractorQueue: React.FC<ExtractorQueueProps> = ({ 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);
Expand All @@ -82,7 +86,7 @@ const ExtractorQueue: React.FC<ExtractorQueueProps> = ({ className }) => {
id: taskData?.id,
type: taskData?.type,
state: taskData?.state, // 提取状态
},
} as any,
].concat(taskListRef?.current)
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ const MdViewer: React.FC<IMdViewerProps> = ({
))}
</ul>
<SaveStatus ref={statusRef} />

{displayType === "code" && (
<>
<Tooltip
Expand Down
10 changes: 0 additions & 10 deletions projects/web_demo/web_demo/node_modules/.yarn-integrity

This file was deleted.

4 changes: 0 additions & 4 deletions projects/web_demo/web_demo/yarn.lock

This file was deleted.

Loading