Commit 4446fac3 by zhangleyuan

feat:修改文件大小单位的转换

parent 39d23137
...@@ -302,7 +302,7 @@ class CopyFileModal extends React.Component { ...@@ -302,7 +302,7 @@ class CopyFileModal extends React.Component {
const isFolder = folderType === 'FOLDER'; // 是否是文件夹 const isFolder = folderType === 'FOLDER'; // 是否是文件夹
let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; // 文件大小 let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; // 文件大小
if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) { if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(folderSize / 1000).toFixed(1)}kb`; _size = `${(folderSize / 1024).toFixed(1)}kb`;
} }
let imgSrc = !isFolder ? // 文件/文件夹图标 let imgSrc = !isFolder ? // 文件/文件夹图标
FILE_TYPE_ICON_MAP[folderFormat] : FILE_TYPE_ICON_MAP[folderFormat] :
......
...@@ -40,7 +40,7 @@ class NonCompliantFileModal extends React.Component { ...@@ -40,7 +40,7 @@ class NonCompliantFileModal extends React.Component {
fileList.map((file, index) => { fileList.map((file, index) => {
let _size = `${(file.size / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(file.size / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (file.size < 0.1 * DEFAULT_SIZE_UNIT) { if (file.size < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(file.size / 1000).toFixed(1)}kb`; _size = `${(file.size / 1024).toFixed(1)}kb`;
} }
return ( return (
<div className="file-list__item" key={`file-list__item${index}`}> <div className="file-list__item" key={`file-list__item${index}`}>
......
...@@ -608,7 +608,7 @@ class SelectPrepareFileModal extends React.Component { ...@@ -608,7 +608,7 @@ class SelectPrepareFileModal extends React.Component {
let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) { if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(folderSize / 1000).toFixed(1)}kb`; _size = `${(folderSize / 1024).toFixed(1)}kb`;
} }
let imgSrc = !isFolder ? let imgSrc = !isFolder ?
......
...@@ -302,7 +302,7 @@ class UploadProgressModal extends React.Component { ...@@ -302,7 +302,7 @@ class UploadProgressModal extends React.Component {
let { size, type, name } = file.fileContent; let { size, type, name } = file.fileContent;
let _size = `${(size / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(size / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (size < 0.1 * DEFAULT_SIZE_UNIT) { if (size < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(size / 1000).toFixed(1)}kb`; _size = `${(size / 1024).toFixed(1)}kb`;
} }
if (!type) { if (!type) {
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* @Last Modified by: 吴文洁 * @Last Modified by: 吴文洁
* @Last Modified time: 2020-07-16 11:32:50 * @Last Modified time: 2020-07-16 11:32:50
*/ */
const DEFAULT_SIZE_UNIT = 1000 * 1000; // 将B转换成M const DEFAULT_SIZE_UNIT = 1024 * 1024; // 将B转换成M
const GIGABYTE_SIZE_UNIT = 1000 * 1000 * 1000; // 转换为G const GIGABYTE_SIZE_UNIT = 1024 * 1024 * 1024; // 转换为G
const SupportFileType = [ const SupportFileType = [
"application/msword", "application/msword",
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-20 09:21:40 * @Date: 2020-08-20 09:21:40
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-25 10:48:15 * @LastEditTime: 2020-12-31 10:39:16
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
const DEFAULT_SIZE_UNIT: number = 1000 * 1000; // 将B转换成M const DEFAULT_SIZE_UNIT: number = 1024 * 1024; // 将B转换成M
const SUFFIX_MAP: { const SUFFIX_MAP: {
[key: string]: string [key: string]: string
......
...@@ -73,7 +73,7 @@ class ManageCoursewareModal extends React.Component { ...@@ -73,7 +73,7 @@ class ManageCoursewareModal extends React.Component {
if (data.fileSize > 0.1 * DEFAULT_SIZE_UNIT) { if (data.fileSize > 0.1 * DEFAULT_SIZE_UNIT) {
data.fileSize = `${(data.fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; data.fileSize = `${(data.fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
} else { } else {
data.fileSize = `${(data.fileSize / 1000).toFixed(1)}KB`; data.fileSize = `${(data.fileSize / 1024).toFixed(1)}KB`;
} }
} else { } else {
data.fileSize = '-'; data.fileSize = '-';
...@@ -91,7 +91,7 @@ class ManageCoursewareModal extends React.Component { ...@@ -91,7 +91,7 @@ class ManageCoursewareModal extends React.Component {
if (item.fileSize > 0.1 * DEFAULT_SIZE_UNIT) { if (item.fileSize > 0.1 * DEFAULT_SIZE_UNIT) {
item.fileSize = `${(item.fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; item.fileSize = `${(item.fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
} else { } else {
item.fileSize = `${(item.fileSize / 1000).toFixed(1)}KB`; item.fileSize = `${(item.fileSize / 1024).toFixed(1)}KB`;
} }
} else { } else {
item.fileSize = '-'; item.fileSize = '-';
......
...@@ -223,7 +223,7 @@ class FolderList extends React.Component { ...@@ -223,7 +223,7 @@ class FolderList extends React.Component {
const _fileSize = Number(value); const _fileSize = Number(value);
let _size = `${(_fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(_fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (_fileSize < 0.1 * DEFAULT_SIZE_UNIT) { if (_fileSize < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(_fileSize / 1000).toFixed(1)}kb`; _size = `${(_fileSize / 1024).toFixed(1)}kb`;
} }
return ( return (
<span>{folderType === 'FILE' ? _size : '-'}</span> <span>{folderType === 'FILE' ? _size : '-'}</span>
......
...@@ -40,7 +40,7 @@ class NonCompliantFileModal extends React.Component { ...@@ -40,7 +40,7 @@ class NonCompliantFileModal extends React.Component {
fileList.map((file, index) => { fileList.map((file, index) => {
let _size = `${(file.size / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(file.size / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (file.size < 0.1 * DEFAULT_SIZE_UNIT) { if (file.size < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(file.size / 1000).toFixed(1)}kb`; _size = `${(file.size / 1024).toFixed(1)}kb`;
} }
return ( return (
<div className="file-list__item" key={`file-list__item${index}`}> <div className="file-list__item" key={`file-list__item${index}`}>
......
...@@ -586,7 +586,7 @@ class SelectPrepareFileModal extends React.Component { ...@@ -586,7 +586,7 @@ class SelectPrepareFileModal extends React.Component {
let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(folderSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) { if (folderSize < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(folderSize / 1000).toFixed(1)}kb`; _size = `${(folderSize / 1024).toFixed(1)}kb`;
} }
let imgSrc = !isFolder ? let imgSrc = !isFolder ?
......
...@@ -308,7 +308,7 @@ class UploadProgressModal extends React.Component { ...@@ -308,7 +308,7 @@ class UploadProgressModal extends React.Component {
let { size, type, name } = file.fileContent; let { size, type, name } = file.fileContent;
let _size = `${(size / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(size / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (size < 0.1 * DEFAULT_SIZE_UNIT) { if (size < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(size / 1000).toFixed(1)}kb`; _size = `${(size / 1024).toFixed(1)}kb`;
} }
if (!type) { if (!type) {
......
...@@ -239,7 +239,7 @@ class FolderList extends React.Component { ...@@ -239,7 +239,7 @@ class FolderList extends React.Component {
const _fileSize = Number(value); const _fileSize = Number(value);
let _size = `${(_fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`; let _size = `${(_fileSize / DEFAULT_SIZE_UNIT).toFixed(1)}M`;
if (_fileSize < 0.1 * DEFAULT_SIZE_UNIT) { if (_fileSize < 0.1 * DEFAULT_SIZE_UNIT) {
_size = `${(_fileSize / 1000).toFixed(1)}kb`; _size = `${(_fileSize / 1024).toFixed(1)}kb`;
} }
return ( return (
<span>{folderType === 'FILE' ? _size : '-'}</span> <span>{folderType === 'FILE' ? _size : '-'}</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment