happyz
/
memos
mirror of https://github.com/usememos/memos.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: render dates correctly in memo detail sidebar and link dialog 

Convert protobuf Timestamp objects to Date before formatting
to prevent "[object Object]" from appearing in the UI.

Fixes #5368
This commit is contained in:
Steven 2025-12-22 20:24:04 +08:00
parent be7ef74698
commit 332d32bd35
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx
View File

@ -1,4 +1,5 @@
import { create } from "@bufbuild/protobuf";
import { timestampDate } from "@bufbuild/protobuf/wkt";
import { isEqual } from "lodash-es";
import { CheckCircleIcon, Code2Icon, HashIcon, LinkIcon } from "lucide-react";
import { cn } from "@/lib/utils";
@ -36,14 +37,14 @@ const MemoDetailSidebar = ({ memo, className, parentPage }: Props) => {
<p className="flex flex-row justify-start items-center w-full gap-1 mb-1 text-sm leading-6 text-muted-foreground select-none">
<span>{t("common.created-at")}</span>
</p>
<p className="text-sm text-muted-foreground">{memo.createTime?.toLocaleString()}</p>
<p className="text-sm text-muted-foreground">{memo.createTime && timestampDate(memo.createTime).toLocaleString()}</p>
</div>
{!isEqual(memo.createTime, memo.updateTime) && (
<div className="w-full flex flex-col">
<p className="flex flex-row justify-start items-center w-full gap-1 mb-1 text-sm leading-6 text-muted-foreground select-none">
<span>{t("common.last-updated-at")}</span>
</p>
<p className="text-sm text-muted-foreground">{memo.updateTime?.toLocaleString()}</p>
<p className="text-sm text-muted-foreground">{memo.updateTime && timestampDate(memo.updateTime).toLocaleString()}</p>
</div>
)}
{hasSpecialProperty && (

5
web/src/components/MemoEditor/components/LinkMemoDialog.tsx
View File

@ -1,3 +1,4 @@
import { timestampDate } from "@bufbuild/protobuf/wkt";
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { Memo } from "@/types/proto/api/v1/memo_service_pb";
@ -75,7 +76,9 @@ export const LinkMemoDialog = ({
onClick={() => onSelectMemo(memo)}
>
<div className="w-full flex flex-col justify-start items-start">
<p className="text-xs text-muted-foreground select-none">{memo.displayTime?.toLocaleString()}</p>
<p className="text-xs text-muted-foreground select-none">
{memo.displayTime && timestampDate(memo.displayTime).toLocaleString()}
</p>
<p className="mt-0.5 text-sm leading-5 line-clamp-2">
{searchText ? highlightSearchText(memo.content, searchText) : memo.snippet}
</p>