Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -622,45 +622,16 @@ class GraduationTaskssettinglist extends Component{
 
 	 let  {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
 
-		axios.get(url,{
+	 let params ={
-			teacher_comment:teacher_comment,
+		teacher_comment:teacher_comment,
-			task_status:task_status,
+		task_status:task_status,
-			course_group:course_group,
+		course_group:course_group,
-			cross_comment:cross_comment,
+		cross_comment:cross_comment,
-			order:order,
+		order:order,
-			b_order:b_order,
+		b_order:b_order,
-			search:search,
+		search:search,
-		}).then((response) => {
+	 }
-			if(response.data.status&&response.data.status===-1){
+	 this.refs.DownloadMessage.confirmysl(url,params);
-
-			}else if(response.data.status&&response.data.status===-2){
-				if(response.data.messages === "100"){
-					// 已超出文件导出的上限数量（100 ），建议：
-
-					this.setState({
-						DownloadType:true,
-						DownloadMessageval:100
-					})
-				}else {
-					//因附件资料超过500M
-					this.setState({
-						DownloadType:true,
-						DownloadMessageval:500
-					})
-				}
-			}else {
-				this.props.showNotification(`正在下载中`);
-				window.open("/api"+url, '_blank');
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-	Downloadcal=()=>{
-		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
-		})
 	}
 	render(){
 
@@ -1010,13 +981,7 @@ class GraduationTaskssettinglist extends Component{
 						setupdate={this.setupdate}
 					/>:""}
 
-					<DownloadMessage
+					<DownloadMessage ref="DownloadMessage" {...this.props} />
-						{...this.props}
-						value={this.state.DownloadMessageval}
-						modalCancel={this.Downloadcal}
-						modalsType={this.state.DownloadType}
-					/>
-
 
 					{taskslistdata&&taskslistdata?
 						// 教师列表

public/react/src/modules/modals/DownloadMessage.js

@@ -1,19 +1,62 @@
 import React, { Component } from 'react';
 import {getImageUrl} from 'educoder';
 import { Modal} from 'antd';
+
+import axios from 'axios';
+
 class DownloadMessage extends Component {
   constructor(props) {
     super(props);
     this.state = {
       funmodalsType:false,
-      istype:false
+      istype:false,
+      DownloadMessageval:undefined,
+      DownloadType:false
     }
   }
 
 	setDownload=()=>{
-		this.props.modalCancel();
+		this.modalCancel();
 		window.open(`/users/${this.props.user.login}/private_messages`)
+  }
+  
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
 	}
+  
+  /// 确认是否下载
+	confirmysl(url,params){
+     axios.get(url,{
+       params
+     }).then((response) => {
+       if(response.data.status&&response.data.status===-1){
+ 
+       }else if(response.data.status&&response.data.status===-2){
+         if(response.data.messages === "100"){
+           // 已超出文件导出的上限数量（100 ），建议：
+ 
+           this.setState({
+             DownloadType:true,
+             DownloadMessageval:100
+           })
+         }else {
+           //因附件资料超过500M
+           this.setState({
+             DownloadType:true,
+             DownloadMessageval:500
+           })
+         }
+       }else {
+         this.props.showNotification(`正在下载中`);
+         window.open("/api"+url, '_blank');
+       }
+     }).catch((error) => {
+       console.log(error)
+     });
+   }
 render() {
 
     return(
@@ -39,7 +82,7 @@ render() {
 							</p>
 							:""}
 						<div className="clearfix mt30 edu-txt-center">
-							<a  className="task-btn mr30" onClick={this.props.modalCancel}>取消</a>
+							<a  className="task-btn mr30" onClick={this.modalCancel}>取消</a>
 							<a className="task-btn task-btn-orange" onClick={this.setDownload}>立即联系</a>
 						</div>
 				</div>

public/react/src/modules/user/account/ChangeHeaderPicModal.js

@@ -39,11 +39,27 @@ class ChangeHeaderPicModal extends Component{
             URL.revokeObjectURL(uploadedImageURL);
           }
           const image = document.getElementById( imageId );
-          image.src = uploadedImageURL = URL.createObjectURL(file);
+
-          that.refs['cropper'].renew(image)
+          // base64
-          // cropper.destroy();
+          var reader = new FileReader();
-          // cropper = new Cropper(image, options);
+          reader.readAsBinaryString(file);
-          inputImage.value = null;
+
+          reader.onload = () => {
+              let base64_content = btoa(reader.result);
+              console.log();
+              
+              image.src = `data:${file.type};base64,${base64_content}` // uploadedImageURL = URL.createObjectURL(file);
+              that.fileUploaded = true;
+              that.refs['cropper'].renew(image)
+              // cropper.destroy();
+              // cropper = new Cropper(image, options);
+              inputImage.value = null;
+          };
+          reader.onerror = function() {
+              console.log('there are some problems');
+          };
+
+          
         } else {
           this.props.showNotification && this.props.showNotification("请选择一个图片格式的文件")
           // window.alert('Please choose an image file.');
@@ -57,6 +73,8 @@ class ChangeHeaderPicModal extends Component{
 
     this.refs['modalWrapper'].setVisible(visible)
     if (visible) {
+      this.fileUploaded = false;
+
       setTimeout(() => {
         this.init()
       }, 500)
@@ -69,7 +87,12 @@ class ChangeHeaderPicModal extends Component{
   }
 
   onOk = () => {
-    var img_lg = document.getElementById(previewId);           
+    if (this.fileUploaded != true) {
+      this.props.showNotification("请先上传图片")
+      return;
+    }
+    var img_lg = document.getElementById(previewId);      
+    // https://github.com/niklasvh/html2canvas/issues/1908     
     // 截图小的显示框内的内容          
     window.html2canvas(img_lg).then((canvas) => {
       var dataUrl = canvas.toDataURL("image/jpeg");