From 965f9b65f86f800465a12c1062cd5a6383c0cad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 16 Aug 2019 15:50:33 +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

---
 public/react/config/webpack.config.dev.js     |  2 +-
 .../modules/courses/Resource/Fileslistitem.js | 25 ++++++++++++++-----
 .../courses/coursesPublic/Showoldfiles.js     | 19 ++++++++++++--
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 6e78fd410..510bcaa4f 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl);
 module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	devtool: "cheap-module-eval-source-map",
+	// devtool: "cheap-module-eval-source-map",
 	// 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index f0aec7f64..5832770f1 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -36,7 +36,16 @@ class Fileslistitem extends Component{
                 course_id:coursesId
             },
         }).then((result)=>{
-            if(result.data.attachment_histories.length===0){
+
+						if(result.data.attachment_histories.length===0){
+							if(result.data.is_pdf===true){
+								axios.get(result.data.url).then((result)=>{
+									var binaryData = [];
+									binaryData.push(result.data);
+									this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));
+									window.open(this.url);
+								})
+							}else{
 							let link = document.createElement('a');
 							document.body.appendChild(link);
 							link.href = result.data.url;
@@ -46,12 +55,15 @@ class Fileslistitem extends Component{
 							evt.initEvent("click", false, false);
 							link.dispatchEvent(evt);
 							document.body.removeChild(link);
+							}
 						}else{
-                this.setState({
-                    Showoldfiles:true,
-                    allfiles:result.data
-                })
-            }
+							this.setState({
+								Showoldfiles:true,
+								allfiles:result.data
+							})
+						}
+
+
         }).catch((error)=>{
             console.log(error)
         })
@@ -144,6 +156,7 @@ class Fileslistitem extends Component{
 								loadtype={this.state.Loadtype}
 							/>:""}
                 <Showoldfiles
+									  {...this.props}
                     visible={this.state.Showoldfiles}
                     allfiles={this.state.allfiles}
                     closaoldfilesprops={this.closaoldfilesprops}
diff --git a/public/react/src/modules/courses/coursesPublic/Showoldfiles.js b/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
index 314ef44a3..8f1e7a29f 100644
--- a/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
+++ b/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
@@ -42,6 +42,14 @@ class Showoldfiles extends Component{
    this.props.closaoldfilesprops()
 	}
 
+	showfiless=(url)=>{
+			axios.get(url).then((result)=>{
+			var binaryData = [];
+			binaryData.push(result.data);
+			this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));
+			window.open(this.url);
+		})
+	}
 	render(){
 		let {visible,allfiles}=this.props;
 
@@ -175,7 +183,10 @@ class Showoldfiles extends Component{
 												<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={allfiles.id}>
 
 													<li className="fl fontlefts">
-														<a className={"isabox"} href={allfiles.url}>{allfiles.title}</a>
+														{allfiles.is_pdf===false?
+														<a className={"isabox"} href={allfiles.url} >{allfiles.title}</a>:
+															<a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a>
+														}
 														<span className={"newcolor-orange fl"}>当前版本</span>
 													</li>
 
@@ -191,7 +202,11 @@ class Showoldfiles extends Component{
 																<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={item.id} key={key}>
 
 																	<li className="fl fontlefts">
-																		<a  className={"isabox"} href={item.url}>{item.title}</a>
+
+																		{allfiles.is_pdf===false?
+																			<a  className={"isabox"} href={item.url}>{item.title}</a>:
+																			<a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a>
+																		}
 																	</li>
 
 																	<li className="fl filesves ">