YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: update MemoResources props (#432)

Browse Source
This commit is contained in:
Zeng1998
2022-11-09 22:10:31 +08:00
committed by GitHub
parent dc5d705f8c
commit 1e3b8315a0
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/ArchivedMemo.tsx
View File

@ -67,7 +67,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
</div> </div>
</div> </div>
<MemoContent content={memo.content} /> <MemoContent content={memo.content} />
<MemoResources memo={memo} /> <MemoResources resourceList={memo.resourceList} />
</div> </div>
); );
}; };

2
web/src/components/DailyMemo.tsx
View File

@ -21,7 +21,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
</div> </div>
<div className="memo-container"> <div className="memo-container">
<MemoContent content={memo.content} displayConfig={displayConfig} /> <MemoContent content={memo.content} displayConfig={displayConfig} />
<MemoResources memo={memo} /> <MemoResources resourceList={memo.resourceList} />
</div> </div>
<div className="split-line"></div> <div className="split-line"></div>
</div> </div>

2
web/src/components/Memo.tsx
View File

@ -243,7 +243,7 @@ const Memo: React.FC<Props> = (props: Props) => {
onMemoContentClick={handleMemoContentClick} onMemoContentClick={handleMemoContentClick}
onMemoContentDoubleClick={handleMemoContentDoubleClick} onMemoContentDoubleClick={handleMemoContentDoubleClick}
/> />
<MemoResources memo={memo} /> <MemoResources resourceList={memo.resourceList} />
</div> </div>
); );
}; };

2
web/src/components/MemoCardDialog.tsx
View File

@ -195,7 +195,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
</div> </div>
<div className="memo-container"> <div className="memo-container">
<MemoContent displayConfig={{ enableExpand: false }} content={memo.content} onMemoContentClick={handleMemoContentClick} /> <MemoContent displayConfig={{ enableExpand: false }} content={memo.content} onMemoContentClick={handleMemoContentClick} />
<MemoResources memo={memo} /> <MemoResources resourceList={memo.resourceList} />
</div> </div>
<div className="layer-container"></div> <div className="layer-container"></div>
{linkMemos.map((_, idx) => { {linkMemos.map((_, idx) => {

11
web/src/components/MemoResources.tsx
View File

@ -3,13 +3,14 @@ import Icon from "./Icon";
import "../less/memo-resources.less"; import "../less/memo-resources.less";
interface Props { interface Props {
memo: Memo; className?: string;
resourceList: Resource[];
} }
const MemoResources: React.FC<Props> = (props: Props) => { const MemoResources: React.FC<Props> = (props: Props) => {
const { memo } = props; const { className, resourceList } = props;
const imageList = memo.resourceList.filter((resource) => resource.type.includes("image")); const imageList = resourceList.filter((resource) => resource.type.includes("image"));
const otherResourceList = memo.resourceList.filter((resource) => !resource.type.includes("image")); const otherResourceList = resourceList.filter((resource) => !resource.type.includes("image"));
const handlPreviewBtnClick = (resource: Resource) => { const handlPreviewBtnClick = (resource: Resource) => {
const resourceUrl = `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; const resourceUrl = `${window.location.origin}/o/r/${resource.id}/${resource.filename}`;
@ -21,7 +22,7 @@ const MemoResources: React.FC<Props> = (props: Props) => {
}); });
return ( return (
<div className="resource-wrapper"> <div className={`resource-wrapper ${className || ""}`}>
{imageList.length > 0 && ( {imageList.length > 0 && (
<div className="images-wrapper"> <div className="images-wrapper">
{imageList.map((resource, index) => ( {imageList.map((resource, index) => (

2
web/src/pages/Explore.tsx
View File

@ -88,7 +88,7 @@ const Explore = () => {
</a> </a>
</div> </div>
<MemoContent className="memo-content" content={memo.content} onMemoContentClick={() => undefined} /> <MemoContent className="memo-content" content={memo.content} onMemoContentClick={() => undefined} />
<MemoResources memo={memo} /> <MemoResources resourceList={memo.resourceList} />
</div> </div>
); );
})} })}

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

@ -148,7 +148,7 @@ const MemoDetail = () => {
/> />
</div> </div>
<MemoContent className="memo-content" content={state.memo.content} onMemoContentClick={() => undefined} /> <MemoContent className="memo-content" content={state.memo.content} onMemoContentClick={() => undefined} />
<MemoResources memo={state.memo} /> <MemoResources resourceList={state.memo.resourceList} />
</div> </div>
</main> </main>
)} )}