usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-10-04 07:17:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: update memo editor cache key

Browse Source
This commit is contained in:
Steven 2024-01-20 20:52:11 +08:00
parent 776785ac90
commit eb72609ea3
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
View File

@ -1,4 +1,5 @@
import { useContext, useEffect } from "react";
import MemoResourceListView from "@/components/MemoResourceListView";
import useLoading from "@/hooks/useLoading";
import { useMemoStore } from "@/store/v1";
import MemoContent from "..";
@ -33,7 +34,12 @@ const EmbeddedMemo = ({ memoId }: Props) => {
// Add the memo to the set of embedded memos. This is used to prevent infinite loops when a memo embeds itself.
context.embeddedMemos.add(resourceName);
return <MemoContent nodes={memo.nodes} memoId={memoId} embeddedMemos={context.embeddedMemos} />;
return (
<div className="w-full">
<MemoContent nodes={memo.nodes} memoId={memoId} embeddedMemos={context.embeddedMemos} />
<MemoResourceListView resources={memo.resources} />
</div>
);
};
export default EmbeddedMemo;

13
web/src/components/MemoEditor/MemoEditorDialog.tsx
View File

@ -8,10 +8,11 @@ import Icon from "../Icon";
interface Props extends DialogProps {
memoId?: number;
cacheKey?: string;
relationList?: MemoRelation[];
}
const MemoEditorDialog: React.FC<Props> = ({ memoId, relationList, destroy }: Props) => {
const MemoEditorDialog: React.FC<Props> = ({ memoId, cacheKey, relationList, destroy }: Props) => {
const globalStore = useGlobalStore();
const tagStore = useTagStore();
const { systemStatus } = globalStore.state;
@ -26,10 +27,10 @@ const MemoEditorDialog: React.FC<Props> = ({ memoId, relationList, destroy }: Pr
return (
<>
<div className="dialog-header-container">
<div className="w-full flex flex-row justify-between items-center mb-2">
<div className="flex flex-row justify-start items-center">
<img className="w-5 h-auto rounded-full shadow" src={systemStatus.customizedProfile.logoUrl} alt="" />
<p className="ml-1 text-black opacity-80 dark:text-gray-200">{systemStatus.customizedProfile.name}</p>
<img className="w-6 h-auto rounded-full shadow" src={systemStatus.customizedProfile.logoUrl} alt="" />
<p className="ml-1 text-lg opacity-80 dark:text-gray-300">{systemStatus.customizedProfile.name}</p>
</div>
<IconButton size="sm" onClick={handleCloseBtnClick}>
<Icon.X className="w-5 h-auto" />
@ -38,7 +39,7 @@ const MemoEditorDialog: React.FC<Props> = ({ memoId, relationList, destroy }: Pr
<div className="flex flex-col justify-start items-start max-w-full w-[36rem]">
<MemoEditorV1
className="border-none !p-0 -mb-2"
cacheKey={`memo-editor-${memoId}`}
cacheKey={`memo-editor-${cacheKey || memoId}`}
memoId={memoId}
relationList={relationList}
onConfirm={handleCloseBtnClick}
@ -49,7 +50,7 @@ const MemoEditorDialog: React.FC<Props> = ({ memoId, relationList, destroy }: Pr
);
};
export default function showMemoEditorDialog(props: Pick<Props, "memoId" | "relationList"> = {}): void {
export default function showMemoEditorDialog(props: Pick<Props, "memoId" | "cacheKey" | "relationList"> = {}): void {
generateDialog(
{
className: "memo-editor-dialog",

1
web/src/components/MemoView.tsx
View File

@ -106,6 +106,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
const handleEditMemoClick = () => {
showMemoEditorDialog({
memoId: memo.id,
cacheKey: `${memo.id}-${memo.updateTime}`,
});
};

1
web/src/pages/MemoDetail.tsx
View File

@ -95,6 +95,7 @@ const MemoDetail = () => {
const handleEditMemoClick = () => {
showMemoEditorDialog({
memoId: memo.id,
cacheKey: `${memo.id}-${memo.updateTime}`,
});
};