fix: share memo with resource list (#431)

* fix: share memo with resource list

* update

* Update web/src/components/ShareMemoImageDialog.tsx

Co-authored-by: boojack <stevenlgtm@gmail.com>
This commit is contained in:
Zeng1998
2022-11-09 22:58:16 +08:00
committed by GitHub
parent 1e3b8315a0
commit b6c0a04394
2 changed files with 6 additions and 2 deletions

View File

@@ -22,7 +22,7 @@ const MemoResources: React.FC<Props> = (props: Props) => {
});
return (
<div className={`resource-wrapper ${className || ""}`}>
<div className={`resource-wrapper ${className || ""}`}>
{imageList.length > 0 && (
<div className="images-wrapper">
{imageList.map((resource, index) => (

View File

@@ -8,6 +8,7 @@ import Icon from "./Icon";
import { generateDialog } from "./Dialog";
import MemoContent from "./MemoContent";
import "../less/share-memo-image-dialog.less";
import MemoResources from "./MemoResources";
interface Props extends DialogProps {
memo: Memo;
@@ -72,7 +73,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
<div className="memo-container" ref={memoElRef}>
{shortcutImgUrl !== "" && <img className="memo-shortcut-img" onClick={handleDownloadBtnClick} src={shortcutImgUrl} />}
<span className="time-text">{memo.createdAtStr}</span>
<MemoContent className="memo-content-wrapper" content={memo.content} displayConfig={{ enableExpand: false }} />
<div className="memo-content-wrapper">
<MemoContent content={memo.content} displayConfig={{ enableExpand: false }} />
<MemoResources resourceList={memo.resourceList} />
</div>
<div className="watermark-container">
<span className="normal-text">
<span className="icon-text"></span> by <span className="name-text">{userinfo?.name}</span>