From 687f52e27c1ce9c9980693e537eeed63d576276d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 31 Aug 2019 13:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../completetaskdetails/Completetaskdetails.js | 15 +++++++++------
.../comtopicdetails/Completetopicdetails.js | 15 +++++++++------
.../courses/groupjobbank/Groupjobbandetails.js | 14 +++++++++-----
.../courses/questionbank/Generaljobdetails.js | 2 +-
4 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
index 979e6daf7..a80d306a2 100644
--- a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
@@ -13,6 +13,8 @@ import {
import './completetaskdetails.css';
import GroupPackage from "../groupjobbank/GroupPackage";
import GroupPackage2 from "../groupjobbank/GroupPackage2";
+import AttachmentsList from "../../../common/components/attachment/AttachmentList";
+
class Groupjobbandetails extends Component {
@@ -80,12 +82,13 @@ class Groupjobbandetails extends Component {
}
{/*<div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
- {datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
- return (
- <GroupPackage key={key} attachments={item}></GroupPackage>
- )
- })}
-
+ {/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
+ {/* return (*/}
+ {/* <GroupPackage key={key} attachments={item}></GroupPackage>*/}
+ {/* )*/}
+ {/*})}*/}
+ {datas.attachments === undefined ? "" :
+ <AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
<GroupPackage2 datas={datas} bool={false}></GroupPackage2>
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
index fbfb65d44..5d06d24c7 100644
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
+++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
@@ -12,6 +12,7 @@ import {
} from "antd";
import GroupPackage from '../groupjobbank/GroupPackage'
import './completetopicde.css';
+import AttachmentsList from "../../../common/components/attachment/AttachmentList";
class Completetopicdetails extends Component {
@@ -79,12 +80,14 @@ class Completetopicdetails extends Component {
)
}
{/*<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>
- )
- })}
+
+ {/*{datas.attachment_list === undefined ? "" : datas.attachment_list.map((item, key) => {*/}
+ {/* return (*/}
+ {/* <GroupPackage key={key} attachments={item}></GroupPackage>*/}
+ {/* )*/}
+ {/*})}*/}
+ {datas.attachment_list === undefined ? "" :
+ <AttachmentsList {...this.state} {...this.props} attachments={datas.attachment_list} ></AttachmentsList>}
</div>
</div>
<div style={{width:"100%", padding: "36px"}}>
diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
index 805ca65a0..7e73d6546 100644
--- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
+++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
@@ -12,6 +12,8 @@ import {
} from "antd";
import './questionbanks.css';
import GroupPackage from "./GroupPackage";
+import AttachmentsList from "../../../common/components/attachment/AttachmentList";
+
import GroupPackage2 from "./GroupPackage2";
@@ -81,11 +83,13 @@ class Groupjobbandetails extends Component {
}
{/*<div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
- {datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
- return (
- <GroupPackage key={key} attachments={item}></GroupPackage>
- )
- })}
+ {/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
+ {/* return (*/}
+ {/* <GroupPackage key={key} attachments={item}></GroupPackage>*/}
+ {/* )*/}
+ {/*})}*/}
+ {datas.attachments === undefined ? "" :
+ <AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
<GroupPackage2 datas={datas} bool={true}></GroupPackage2>
</div>
diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
index 9a69ce30d..8c870dd68 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
@@ -80,7 +80,7 @@ class Generaljobdetails extends Component {
{datas.attachments === undefined ? "" :
<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
-
+
</div>
</div>