From ec24a6c20cec38fc2a6d397437162874e251ca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= Date: Tue, 8 Jan 2019 11:53:53 +0800 Subject: [PATCH] update upload-list zindex (#2784) --- frontend/src/components/file-uploader/file-uploader.js | 4 ++-- .../src/components/file-uploader/upload-progress-dialog.js | 2 +- frontend/src/css/file-uploader.css | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/file-uploader/file-uploader.js b/frontend/src/components/file-uploader/file-uploader.js index 29d422c844..2fa72ce8df 100644 --- a/frontend/src/components/file-uploader/file-uploader.js +++ b/frontend/src/components/file-uploader/file-uploader.js @@ -40,7 +40,7 @@ class FileUploader extends React.Component { isUploadProgressDialogShow: false, isUploadRemindDialogShow: false, currentResumableFile: null, - uploadBitrate: 0 + uploadBitrate: '0' }; this.notifiedFolders = []; @@ -224,7 +224,7 @@ class FileUploader extends React.Component { if (this.timestamp) { let timeDiff = (now - this.timestamp); if (timeDiff < this.bitrateInterval) { - return this.state.uploadBitrate; + return this.state.uploadBitrate; } uploadBitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8; } diff --git a/frontend/src/components/file-uploader/upload-progress-dialog.js b/frontend/src/components/file-uploader/upload-progress-dialog.js index c7937879ee..971ed763f1 100644 --- a/frontend/src/components/file-uploader/upload-progress-dialog.js +++ b/frontend/src/components/file-uploader/upload-progress-dialog.js @@ -4,7 +4,7 @@ import { gettext } from '../../utils/constants'; import UploadListItem from './upload-list-item'; const propTypes = { - uploadBitrate: PropTypes.number.isRequired, + uploadBitrate: PropTypes.string.isRequired, totalProgress: PropTypes.number.isRequired, uploadFileList: PropTypes.array.isRequired, onCloseUploadDialog: PropTypes.func.isRequired, diff --git a/frontend/src/css/file-uploader.css b/frontend/src/css/file-uploader.css index 77a2dcdf3f..264bb27169 100644 --- a/frontend/src/css/file-uploader.css +++ b/frontend/src/css/file-uploader.css @@ -20,6 +20,7 @@ border-radius: 3px; box-shadow: 0 0 6px #ddd; background-color: #fff; + z-index: 1050; } .uploader-list-header {