From 5f318cdbdd3b2a428742ecd16ddd9a59db45b742 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 3 Sep 2019 13:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/boards/BoardsNew.js | 11 ++++++-----
.../src/modules/courses/busyWork/CommonWorkPost.js | 2 +-
public/react/src/modules/courses/busyWork/NewWork.js | 12 ++++++++----
.../graduation/tasks/GraduationTasksSubmitedit.js | 2 +-
.../graduation/tasks/GraduationTasksSubmitnew.js | 2 +-
public/react/src/modules/forums/MemoNew.js | 2 +-
public/react/src/modules/moop_cases/CaseNew.js | 2 +-
7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 8411e8c49..a08225c1f 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -181,15 +181,16 @@ class BoardsNew extends Component{
}
// 附件相关 START
handleChange = (info) => {
- let fileList = info.fileList;
- this.setState({ fileList: appendFileSizeToUploadFileAll(fileList)
- });
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+ let fileList = info.fileList;
+ this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+ }
}
onAttachmentRemove = (file) => {
if(!file.percent || file.percent == 100){
- confirm({
+ this.props.confirm({
// title: '确定要删除这个附件吗?',
- title: '是否确认删除?',
+ content: '是否确认删除?',
okText: '确定',
cancelText: '取消',
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 98fe5401c..312756ec4 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -291,7 +291,7 @@ class CommonWorkPost extends Component{
}
// 附件相关 START
handleChange = (info) => {
- if (info.file.status === 'uploading' || info.file.status === 'done') {
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 4b2224fd1..8000de59f 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -235,12 +235,16 @@ class NewWork extends Component{
}
handleContentUploadChange = (info) => {
- let contentFileList = info.fileList;
- this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+ let contentFileList = info.fileList;
+ this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+ }
}
handleAnswerUploadChange = (info) => {
- let answerFileList = info.fileList;
- this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+ let answerFileList = info.fileList;
+ this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
+ }
}
onAttachmentRemove = (file, stateName) => {
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 2d9280ec1..3116e8255 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -116,7 +116,7 @@ class GraduationTasksSubmitedit extends Component{
this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
}
- if (info.file.status === 'done') {
+ if (info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 57eb6502f..cb7d3c586 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -125,7 +125,7 @@ class GraduationTasksSubmitnew extends Component{
this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
}
- if (info.file.status === 'done') {
+ if (info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
}
diff --git a/public/react/src/modules/forums/MemoNew.js b/public/react/src/modules/forums/MemoNew.js
index 88425ab53..a20708234 100644
--- a/public/react/src/modules/forums/MemoNew.js
+++ b/public/react/src/modules/forums/MemoNew.js
@@ -553,7 +553,7 @@ class MemoNew extends Component {
return attachments;
}
handleChange = (info) => {
- if (info.file.status === 'uploading' || info.file.status === 'done') {
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
this.setState({
fileList: appendFileSizeToUploadFileAll(fileList)
diff --git a/public/react/src/modules/moop_cases/CaseNew.js b/public/react/src/modules/moop_cases/CaseNew.js
index e9d3e22f4..ae9ef4f6f 100644
--- a/public/react/src/modules/moop_cases/CaseNew.js
+++ b/public/react/src/modules/moop_cases/CaseNew.js
@@ -92,7 +92,7 @@ class CaseNew extends Component{
}
// 上传附件-change
handleContentUploadChange = (info) => {
- if (info.file.status === 'done' || info.file.status === 'uploading') {
+ if (info.file.status === 'done' || info.file.status === 'uploading' || info.file.status === 'removed') {
let contentFileList = info.fileList;
this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)});
let list = appendFileSizeToUploadFileAll(contentFileList);