From 4e7b26951dc816e51baa105cea6d990515bfb5c4 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 19 Aug 2019 18:07:31 +0800 Subject: [PATCH 1/4] z-index: 9; --- public/react/src/modules/user/usersInfo/common/HeadlessModal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/user/usersInfo/common/HeadlessModal.js b/public/react/src/modules/user/usersInfo/common/HeadlessModal.js index 8e1d38c6f..b208cb951 100644 --- a/public/react/src/modules/user/usersInfo/common/HeadlessModal.js +++ b/public/react/src/modules/user/usersInfo/common/HeadlessModal.js @@ -40,6 +40,7 @@ function HeadlessModal (props) { width: 14px; height: 8px; margin-right: 0px; + z-index: 9; } .headless .icon-htmal5icon19:before { left: -4px; From 068abb8232a23968117ffe7d3b716fdd04d82ba5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 19 Aug 2019 18:22:18 +0800 Subject: [PATCH 2/4] 16 --- public/react/src/modules/user/usersInfo/video/InfosVideo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.js b/public/react/src/modules/user/usersInfo/video/InfosVideo.js index ca2c11740..cb66434d0 100644 --- a/public/react/src/modules/user/usersInfo/video/InfosVideo.js +++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.js @@ -40,7 +40,7 @@ function usePagination() { onChange: onPageChange } } -const PAGE_SIZE = 3 +const PAGE_SIZE = 16 const DEFAULT_VIDEO_WIDTH_IN_MD = "90%" // 400 const DEFAULT_VIDEO_HEIGHT_IN_MD = "55%" // 400 let videoId = {}; From 37a89ccd8b0a02465bf5615aa2cfb552f4561b22 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 19 Aug 2019 18:40:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=9A=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/user/usersInfo/video/AliyunUploaderManager.js | 6 +++--- .../react/src/modules/user/usersInfo/video/VideoReducer.js | 2 +- .../src/modules/user/usersInfo/video/VideoUploadList.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js index a76f7f07b..ea7b060ad 100644 --- a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js +++ b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js @@ -47,7 +47,7 @@ function doCreateUploader (options) { addFileSuccess: function (uploadInfo) { console.log("addFileSuccess: " + uploadInfo.file.name) - + options.addFileSuccess && options.addFileSuccess(uploadInfo) uploader.startUpload() }, // 开始上传 @@ -77,7 +77,7 @@ function doCreateUploader (options) { var videoId = data.VideoId uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId) - options.addFileSuccess && options.addFileSuccess(uploadInfo) + }).catch((error) => { // 删除当前出错的，并执行下一个任务 @@ -109,7 +109,7 @@ function doCreateUploader (options) { uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress) // , videoId - options.addFileSuccess && options.addFileSuccess(uploadInfo) + }).catch((error) => { uploader.deleteFile(uploader._curIndex) uploader.nextUpload() diff --git a/public/react/src/modules/user/usersInfo/video/VideoReducer.js b/public/react/src/modules/user/usersInfo/video/VideoReducer.js index 96faada0f..6765e0468 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoReducer.js +++ b/public/react/src/modules/user/usersInfo/video/VideoReducer.js @@ -4,7 +4,7 @@ function find(state, action) { let _index = -1 state.videos.some((item, index) => { // 同文件不同名字 fileHash也是一样的 - if (item.loaded != 100 && (action.uploadInfo.fileHash == item.fileHash && action.uploadInfo.file.name == item.name)) { + if (item.loaded != 100 && ((!item.fileHash || action.uploadInfo.fileHash == item.fileHash) && action.uploadInfo.file.name == item.name)) { _index = index return true; } diff --git a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js index aaca13352..dcf195deb 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js +++ b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js @@ -390,8 +390,8 @@ function VideoUploadList (props) { {state.videos && state.videos.length === MAX_FILE_COUNT &&
- - 单次最多支持3个视频文件上传 + {/* */} + 提示：单次最多支持3个视频文件上传
} {(!noUploads && state.videos.length < MAX_FILE_COUNT) && document.getElementById('fileUpload').click()} From d1e78b622c81639ff0024ce31b50102942963b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 19 Aug 2019 20:48:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 21 +++------------------ public/stylesheets/educoder/edu-all.css | 21 +++------------------ 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index abcc3a6da..3b96cbf7f 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -112,25 +112,10 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .smallSquare:nth-child(3n+0){margin-right: 0px;} .partimg{height: 180px;width: 100%;border-radius: 6px 6px 0px 0px;} /*块状列表上面的绿色标签*/ -.tag-green{ - position: absolute; - left: 15px; - bottom: 95px;} -.tag-green .tag-name{display: block;width: auto; - /*background-image: url("/images/educoder/tag1.png");*/ - background: #000000; - border: 1px solid #fff; - border-radius: 3px; - font-size: 14px; - background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} +.tag-green{position: absolute;left: 0px;top:20px;} +.tag-green .tag-name{display: block;width: auto;background-image: url("/images/educoder/tag1.png");background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} .tag-orange{position: absolute;right: 0px;top:20px;} -.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800; - background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left; - height: 28px; - line-height: 28px; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} +.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} /*发送至弹框里的下拉框*/ .downSelectOption{position: relative;height: 35px;} .downSelectOption .showOption{background-color: #F4F4F4;border: 1px solid #EAEAEA;width: 100%;padding: 5px 40px 5px 5px;outline: none;height: 100%;box-sizing: border-box;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index a07102d67..d55fd3906 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -114,25 +114,10 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .smallSquare:nth-child(3n+0){margin-right: 0px;} .partimg{height: 180px;width: 100%;border-radius: 6px 6px 0px 0px;} /*块状列表上面的绿色标签*/ -.tag-green{ - position: absolute; - left: 15px; - bottom: 95px;} -.tag-green .tag-name{display: block;width: auto; - /*background-image: url("/images/educoder/tag1.png");*/ - background: #000000; - border: 1px solid #fff; - border-radius: 3px; - font-size: 14px; - background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} +.tag-green{position: absolute;left: 0px;top:20px;} +.tag-green .tag-name{display: block;width: auto;background-image: url("/images/educoder/tag1.png");background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} .tag-orange{position: absolute;right: 0px;top:20px;} -.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800; - background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left; - height: 28px; - line-height: 28px; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} +.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} /*发送至弹框里的下拉框*/ .downSelectOption{position: relative;height: 35px;} .downSelectOption .showOption{background-color: #F4F4F4;border: 1px solid #EAEAEA;width: 100%;padding: 5px 40px 5px 5px;outline: none;height: 100%;box-sizing: border-box;}