From 21d4cebd59823c683fa92852ba967089e81a1e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Sep 2019 11:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../comtopicdetails/Completetopicdetails.js | 43 ++++++++++++-------
.../comtopicdetails/completetopicde.css | 1 -
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
index 0ee640425..f9345a4ac 100644
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
+++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
@@ -65,29 +65,42 @@ class Completetopicdetails extends Component {
<div className="yslquestionbank1">
{
datas&&(datas.description===null?
- <NoneData></NoneData>
+ ""
:datas.description==="null"?
- <NoneData></NoneData>
+ ""
:
datas.description===""?
- <NoneData></NoneData>
+ ""
:
<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
+ )
+ }
- // <div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+ {datas.attachment_list === undefined ?
+ (datas.description===undefined || datas.description===null?
+ <NoneData></NoneData>
+ :
+ ""
)
+ :
+ datas.attachment_list === null ?
+ (datas.description===undefined || datas.description===null?
+ <NoneData></NoneData>
+ :
+ ""
+ )
+ :
+ datas.attachment_list.length === 0 ?
+ (datas.description===undefined || datas.description===null?
+ <NoneData></NoneData>
+ :
+ ""
+ )
+ :
+ <div className="mb29px">
+ <AttachmentsList {...this.state} {...this.props} attachments={datas.attachment_list} ></AttachmentsList>
+ </div>
}
- {/*<div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
-
- {/*{datas.attachment_list === undefined ? "" : datas.attachment_list.map((item, key) => {*/}
- {/* return (*/}
- {/* <GroupPackage key={key} attachments={item}></GroupPackage>*/}
- {/* )*/}
- {/*})}*/}
- <div className="mb29px">
- {datas.attachment_list === undefined ? "" :
- <AttachmentsList {...this.state} {...this.props} attachments={datas.attachment_list} ></AttachmentsList>}
- </div>
</div>
</div>
<div style={{width:"100%", padding: "36px"}}>
diff --git a/public/react/src/modules/courses/comtopicdetails/completetopicde.css b/public/react/src/modules/courses/comtopicdetails/completetopicde.css
index 730c74d6b..19367b3af 100644
--- a/public/react/src/modules/courses/comtopicdetails/completetopicde.css
+++ b/public/react/src/modules/courses/comtopicdetails/completetopicde.css
@@ -6,7 +6,6 @@
}
.yslquesHeigth{
width: 100% !important;
- min-height: 500px !important;
}
.yslquesmarkdowntext{
font-size: 16px;