diff --git a/src/common/model/matter/Matter.ts b/src/common/model/matter/Matter.ts index 6b9e0bf..74300e3 100644 --- a/src/common/model/matter/Matter.ts +++ b/src/common/model/matter/Matter.ts @@ -3,7 +3,7 @@ import axios, { CancelTokenSource } from "axios"; import BaseEntity from "../base/BaseEntity"; import Filter from "../base/filter/Filter"; import HttpUtil from "../../util/HttpUtil"; -import FileUtil from "../../util/FileHelper"; +import FileHelper from "../../util/FileHelper"; import ImageUtil from "../../util/ImageUtil"; import EnvUtil from "../../util/EnvUtil"; import InputFilter from "../base/filter/InputFilter"; @@ -133,46 +133,46 @@ export default class Matter extends BaseEntity { } isImage() { - return FileUtil.isImage(this.name); + return FileHelper.isImage(this.name); } isPdf() { - return FileUtil.isPdf(this.name); + return FileHelper.isPdf(this.name); } isText() { - return FileUtil.isText(this.name); + return FileHelper.isText(this.name); } isDoc() { - return FileUtil.isDoc(this.name); + return FileHelper.isDoc(this.name); } isPpt() { - return FileUtil.isPpt(this.name); + return FileHelper.isPpt(this.name); } isXls() { - return FileUtil.isXls(this.name); + return FileHelper.isXls(this.name); } isAudio() { - return FileUtil.isAudio(this.name); + return FileHelper.isAudio(this.name); } isVideo() { - return FileUtil.isVideo(this.name); + return FileHelper.isVideo(this.name); } isPsd() { - return FileUtil.isPsd(this.name); + return FileHelper.isPsd(this.name); } getIcon() { - if (FileUtil.isImage(this.name)) { + if (FileHelper.isImage(this.name)) { return ImageUtil.handleImageUrl(this.getPreviewUrl(), false, 100, 100); } else { - return FileUtil.getIcon(this.name, this.dir); + return FileHelper.getIcon(this.name, this.dir); } } diff --git a/src/common/model/share/Share.ts b/src/common/model/share/Share.ts index 378e107..6c34995 100644 --- a/src/common/model/share/Share.ts +++ b/src/common/model/share/Share.ts @@ -1,6 +1,6 @@ import BaseEntity from "../base/BaseEntity"; import Matter from "../matter/Matter"; -import FileUtil from "../../util/FileHelper"; +import FileHelper from "../../util/FileHelper"; import EnvUtil from "../../util/EnvUtil"; import {ShareType} from "./ShareType"; import {ShareExpireOption, ShareExpireOptionMap} from "./ShareExpireOption"; @@ -62,12 +62,12 @@ export default class Share extends BaseEntity { getIcon() { if (this.shareType === ShareType.MIX) { - return FileUtil.getIcon( + return FileHelper.getIcon( "zip", false ); } else { - return FileUtil.getIcon( + return FileHelper.getIcon( this.name, this.shareType === ShareType.DIRECTORY ); diff --git a/src/common/util/FileHelper.tsx b/src/common/util/FileHelper.tsx index f3489ad..3926607 100644 --- a/src/common/util/FileHelper.tsx +++ b/src/common/util/FileHelper.tsx @@ -15,7 +15,7 @@ import textSvg from "../../assets/image/file/text.svg"; import videoSvg from "../../assets/image/file/video.svg"; import xlsSvg from "../../assets/image/file/xls.svg"; -export default class FileUtil { +export default class FileHelper { static isImage(name: string | null): boolean { let mimeType = MimeUtil.getMimeType(name); return StringUtil.startWith(mimeType, "image"); @@ -89,26 +89,26 @@ export default class FileUtil { return folderSvg; } - if (FileUtil.isPdf(name)) { + if (FileHelper.isPdf(name)) { return pdfSvg; - } else if (FileUtil.isDoc(name)) { + } else if (FileHelper.isDoc(name)) { return docSvg; - } else if (FileUtil.isPpt(name)) { + } else if (FileHelper.isPpt(name)) { return pptSvg; - } else if (FileUtil.isXls(name)) { + } else if (FileHelper.isXls(name)) { return xlsSvg; - } else if (FileUtil.isAudio(name)) { + } else if (FileHelper.isAudio(name)) { return audioSvg; } else if ( - FileUtil.isVideo(name) || + FileHelper.isVideo(name) || MimeUtil.getExtension(name) === ".mkv" ) { return videoSvg; - } else if (FileUtil.isText(name)) { + } else if (FileHelper.isText(name)) { return textSvg; - } else if (FileUtil.isPsd(name)) { + } else if (FileHelper.isPsd(name)) { return psdSvg; - } else if (FileUtil.isImage(name)) { + } else if (FileHelper.isImage(name)) { return imageSvg; } else if ( StringUtil.endWith(name, "zip") || diff --git a/src/pages/dashboard/Index.tsx b/src/pages/dashboard/Index.tsx index fc4087a..f3e0023 100644 --- a/src/pages/dashboard/Index.tsx +++ b/src/pages/dashboard/Index.tsx @@ -12,7 +12,7 @@ import Pager from "../../common/model/base/Pager"; import Dashboard from '../../common/model/dashboard/Dashboard'; import DateUtil from '../../common/util/DateUtil'; import SortDirection from "../../common/model/base/SortDirection"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import Matter from '../../common/model/matter/Matter'; import Lang from "../../common/model/global/Lang"; import MessageBoxUtil from "../../common/util/MessageBoxUtil"; @@ -346,7 +346,7 @@ export default class Index extends TankComponent {
{Lang.t("dashboard.totalFileSize")}
-
{FileUtil.humanFileSize(dashboard.totalFileSize)}
+
{FileHelper.humanFileSize(dashboard.totalFileSize)}
@@ -355,7 +355,7 @@ export default class Index extends TankComponent {
- {Lang.t("dashboard.yesterdayMatterSize")}:{FileUtil.humanFileSize(yesterdayDashboard.fileSize)} + {Lang.t("dashboard.yesterdayMatterSize")}:{FileHelper.humanFileSize(yesterdayDashboard.fileSize)}
diff --git a/src/pages/matter/List.tsx b/src/pages/matter/List.tsx index 1953fd3..60089cb 100644 --- a/src/pages/matter/List.tsx +++ b/src/pages/matter/List.tsx @@ -45,7 +45,7 @@ import ShareDialogModal from "../share/widget/ShareDialogModal"; import BreadcrumbModel from "../../common/model/base/option/BreadcrumbModel"; import BreadcrumbPanel from "../widget/BreadcrumbPanel"; import Lang from "../../common/model/global/Lang"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import SafeUtil from "../../common/util/SafeUtil"; import MatterSortPanel from "./widget/MatterSortPanel"; import { @@ -293,7 +293,7 @@ export default class List extends TankComponent { MessageBoxUtil.success(Lang.t("matter.uploaded")); } else { // 上传错误弹出提示框 - const url = FileUtil.getErrorLogsToCSVUrl(this.uploadErrorLogs); + const url = FileHelper.getErrorLogsToCSVUrl(this.uploadErrorLogs); Modal.confirm({ title: Lang.t("matter.uploadInfo"), icon: , diff --git a/src/pages/matter/widget/imageCache/ImageCachePanel.tsx b/src/pages/matter/widget/imageCache/ImageCachePanel.tsx index 801a50e..6cb6da7 100644 --- a/src/pages/matter/widget/imageCache/ImageCachePanel.tsx +++ b/src/pages/matter/widget/imageCache/ImageCachePanel.tsx @@ -11,7 +11,7 @@ import { SmallDashOutlined, } from "@ant-design/icons"; import MessageBoxUtil from "../../../../common/util/MessageBoxUtil"; -import FileUtil from "../../../../common/util/FileHelper"; +import FileHelper from "../../../../common/util/FileHelper"; import DateUtil from "../../../../common/util/DateUtil"; import Expanding from "../../../widget/Expanding"; import "./ImageCachePanel.less"; @@ -103,7 +103,7 @@ export default class ImageCachePanel extends TankComponent { } /> - {FileUtil.humanFileSize(imageCache.size)} + {FileHelper.humanFileSize(imageCache.size)} {DateUtil.simpleDateHourMinute(imageCache.updateTime)} diff --git a/src/pages/preference/Edit.tsx b/src/pages/preference/Edit.tsx index 2524361..7e4c63d 100644 --- a/src/pages/preference/Edit.tsx +++ b/src/pages/preference/Edit.tsx @@ -9,7 +9,7 @@ import {Button, Form, Input, InputNumber, Switch} from "antd"; import {SaveOutlined} from "@ant-design/icons"; import TankContentCard from "../widget/TankContentCard"; import Preference from "../../common/model/preference/Preference"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import {FormInstance} from "antd/lib/form"; import MessageBoxUtil from "../../common/util/MessageBoxUtil"; import Sun from "../../common/model/global/Sun"; @@ -164,10 +164,10 @@ export default class Edit extends TankComponent { {Lang.t("preference.current")}: {this.formRef && this.formRef.current - ? FileUtil.humanFileSize( + ? FileHelper.humanFileSize( this.formRef.current.getFieldValue("downloadDirMaxSize") ) - : FileUtil.humanFileSize(preference.defaultTotalSizeLimit)} + : FileHelper.humanFileSize(preference.defaultTotalSizeLimit)} @@ -190,12 +190,12 @@ export default class Edit extends TankComponent { {Lang.t("preference.current")}: {this.formRef && this.formRef.current - ? FileUtil.humanFileSize( + ? FileHelper.humanFileSize( this.formRef.current.getFieldValue( "defaultTotalSizeLimit" ) ) - : FileUtil.humanFileSize(preference.defaultTotalSizeLimit)} + : FileHelper.humanFileSize(preference.defaultTotalSizeLimit)} diff --git a/src/pages/preference/Index.tsx b/src/pages/preference/Index.tsx index 8adaf43..1b4c9fd 100644 --- a/src/pages/preference/Index.tsx +++ b/src/pages/preference/Index.tsx @@ -14,7 +14,7 @@ import { import InfoCell from "../widget/InfoCell"; import Preference from "../../common/model/preference/Preference"; import TankContentCard from "../widget/TankContentCard"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import ImagePreviewer from "../widget/previewer/ImagePreviewer"; import Lang from "../../common/model/global/Lang"; import SingleTextModal from "../widget/SingleTextModal"; @@ -162,11 +162,11 @@ export default class Index extends TankComponent { - {FileUtil.humanFileSize(this.preference.downloadDirMaxSize)} + {FileHelper.humanFileSize(this.preference.downloadDirMaxSize)} - {FileUtil.humanFileSize(this.preference.defaultTotalSizeLimit)} + {FileHelper.humanFileSize(this.preference.defaultTotalSizeLimit)} diff --git a/src/pages/user/Detail.tsx b/src/pages/user/Detail.tsx index 235a33a..f592ea0 100644 --- a/src/pages/user/Detail.tsx +++ b/src/pages/user/Detail.tsx @@ -11,7 +11,7 @@ import TankContentCard from "../widget/TankContentCard"; import { Link, RouteComponentProps } from "react-router-dom"; import ImagePreviewer from "../widget/previewer/ImagePreviewer"; import { UserRole, UserRoleMap } from "../../common/model/user/UserRole"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import { UserStatus, UserStatusMap } from "../../common/model/user/UserStatus"; import BrowserUtil from "../../common/util/BrowserUtil"; import SingleTextModal from "../widget/SingleTextModal"; @@ -207,15 +207,15 @@ export default class Detail extends TankComponent { - {FileUtil.humanFileSize(currentUser.sizeLimit)} + {FileHelper.humanFileSize(currentUser.sizeLimit)} - {FileUtil.humanFileSize(currentUser.totalSizeLimit)} + {FileHelper.humanFileSize(currentUser.totalSizeLimit)} - {FileUtil.humanFileSize(currentUser.totalSize)} + {FileHelper.humanFileSize(currentUser.totalSize)} diff --git a/src/pages/user/Edit.tsx b/src/pages/user/Edit.tsx index 067ba4e..a90a074 100644 --- a/src/pages/user/Edit.tsx +++ b/src/pages/user/Edit.tsx @@ -6,7 +6,7 @@ import {Button, Form, Input, InputNumber, Select} from 'antd'; import User from "../../common/model/user/User"; import Moon from "../../common/model/global/Moon"; import TankTitle from "../widget/TankTitle"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import TankContentCard from "../widget/TankContentCard"; import {FormInstance} from "antd/lib/form"; import {SaveOutlined} from "@ant-design/icons/lib"; @@ -224,8 +224,8 @@ export default class Edit extends TankComponent { {Lang.t("user.current")}: {(this.formRef && this.formRef.current) ? - FileUtil.humanFileSize(this.formRef.current.getFieldValue("sizeLimit")) - : FileUtil.humanFileSize(currentUser.sizeLimit)} + FileHelper.humanFileSize(this.formRef.current.getFieldValue("sizeLimit")) + : FileHelper.humanFileSize(currentUser.sizeLimit)} @@ -244,8 +244,8 @@ export default class Edit extends TankComponent { {Lang.t("user.current")}: {(this.formRef && this.formRef.current) ? - FileUtil.humanFileSize(this.formRef.current.getFieldValue("totalSizeLimit")) - : FileUtil.humanFileSize(currentUser.totalSizeLimit)} + FileHelper.humanFileSize(this.formRef.current.getFieldValue("totalSizeLimit")) + : FileHelper.humanFileSize(currentUser.totalSizeLimit)} diff --git a/src/pages/user/List.tsx b/src/pages/user/List.tsx index 2f29405..9a726bf 100644 --- a/src/pages/user/List.tsx +++ b/src/pages/user/List.tsx @@ -4,7 +4,7 @@ import "./List.less"; import SortDirection from "../../common/model/base/SortDirection"; import Pager from "../../common/model/base/Pager"; import StringUtil from "../../common/util/StringUtil"; -import FileUtil from "../../common/util/FileHelper"; +import FileHelper from "../../common/util/FileHelper"; import DateUtil from "../../common/util/DateUtil"; import FilterPanel from "../widget/filter/FilterPanel"; import TableEmpty from "../widget/TableEmpty"; @@ -157,21 +157,21 @@ export default class List extends TankComponent { title: Lang.t("user.singleFileSizeLimit"), dataIndex: "sizeLimit", render: (text: any, record: User, index: number): React.ReactNode => ( - {FileUtil.humanFileSize(record.sizeLimit)} + {FileHelper.humanFileSize(record.sizeLimit)} ), }, { title: Lang.t("user.totalFileSize"), dataIndex: "totalSize", render: (text: any, record: User, index: number): React.ReactNode => ( - {FileUtil.humanFileSize(record.totalSize)} + {FileHelper.humanFileSize(record.totalSize)} ), }, { title: Lang.t("user.totalFileSizeLimit"), dataIndex: "totalSizeLimit", render: (text: any, record: User, index: number): React.ReactNode => ( - {FileUtil.humanFileSize(record.totalSizeLimit)} + {FileHelper.humanFileSize(record.totalSizeLimit)} ), }, { diff --git a/src/pages/user/widget/MobileUserPanel.tsx b/src/pages/user/widget/MobileUserPanel.tsx index fcf7770..f5ebb6e 100644 --- a/src/pages/user/widget/MobileUserPanel.tsx +++ b/src/pages/user/widget/MobileUserPanel.tsx @@ -6,7 +6,7 @@ import User from "../../../common/model/user/User"; import { Link } from "react-router-dom"; import { UserRoleMap } from "../../../common/model/user/UserRole"; import { Tag, Tooltip } from "antd"; -import FileUtil from "../../../common/util/FileHelper"; +import FileHelper from "../../../common/util/FileHelper"; import { UserStatus, UserStatusMap, @@ -77,13 +77,13 @@ export default class MobileUserPanel extends TankComponent { {this.showMore ? (
- {FileUtil.humanFileSize(user.sizeLimit)} + {FileHelper.humanFileSize(user.sizeLimit)} - {FileUtil.humanFileSize(user.totalSize)} + {FileHelper.humanFileSize(user.totalSize)} - {FileUtil.humanFileSize(user.totalSizeLimit)} + {FileHelper.humanFileSize(user.totalSizeLimit)} diff --git a/src/pages/widget/previewer/BrowserPreviewer.tsx b/src/pages/widget/previewer/BrowserPreviewer.tsx index 65d13bd..57e9ac7 100644 --- a/src/pages/widget/previewer/BrowserPreviewer.tsx +++ b/src/pages/widget/previewer/BrowserPreviewer.tsx @@ -1,7 +1,7 @@ import "./BrowserPreviewer.less" import React from "react"; import * as ReactDOM from 'react-dom'; -import FileUtil from "../../../common/util/FileHelper"; +import FileHelper from "../../../common/util/FileHelper"; import {CloseOutlined} from "@ant-design/icons"; interface IProps { @@ -70,7 +70,7 @@ export default class BrowserPreviewer extends React.Component {
- {this.props.name}({FileUtil.humanFileSize(this.props.size)}) + {this.props.name}({FileHelper.humanFileSize(this.props.size)})