github/tank-front
4
0
Fork 0
mirror of https://github.com/eyebluecn/tank-front synced 2024-04-21 12:31:55 +00:00
Code Issues Releases Wiki Activity

Fix the svg image cannot show bug.

Browse Source
This commit is contained in:
lishuang
2022-03-19 18:35:15 +08:00
parent 08a0178d7b
commit f3d81e0739
15 changed files with 48 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
craco.config.js
+4
View File
@@ -2,6 +2,8 @@ const CracoLessPlugin = require('craco-less');
module.exports = {
devServer: {
// proxy for local development.
proxy: {
'/api': {
target: 'http://localhost:6010',
@@ -14,6 +16,8 @@ module.exports = {
},
plugins: [
{
// less loader.
plugin: CracoLessPlugin,
options: {
lessLoaderOptions: {
src/common/model/matter/Matter.ts
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../util/FileHelper";
import ImageUtil from "../../util/ImageUtil";
import EnvUtil from "../../util/EnvUtil";
import InputFilter from "../base/filter/InputFilter";
src/common/model/share/Share.ts
+8 -5
View File
@@ -1,9 +1,9 @@
import BaseEntity from "../base/BaseEntity";
import Matter from "../matter/Matter";
import FileUtil from "../../util/FileUtil";
import FileUtil from "../../util/FileHelper";
import EnvUtil from "../../util/EnvUtil";
import { ShareType } from "./ShareType";
import { ShareExpireOption, ShareExpireOptionMap } from "./ShareExpireOption";
import {ShareType} from "./ShareType";
import {ShareExpireOption, ShareExpireOptionMap} from "./ShareExpireOption";
import DateUtil from "../../util/DateUtil";
import SafeUtil from "../../util/SafeUtil";
import MessageBoxUtil from "../../util/MessageBoxUtil";
@@ -62,7 +62,10 @@ export default class Share extends BaseEntity {
getIcon() {
if (this.shareType === ShareType.MIX) {
return require("../../../assets/image/file/archive.svg");
return FileUtil.getIcon(
"zip",
false
);
} else {
return FileUtil.getIcon(
this.name,
@@ -135,7 +138,7 @@ export default class Share extends BaseEntity {
) {
this.httpPost(
Share.URL_DELETE_BATCH,
{ uuids: uuids },
{uuids: uuids},
function (response: any) {
SafeUtil.safeCallback(successCallback)(response);
},
src/common/util/FileUtil.ts → src/common/util/FileHelper.tsx
+24 -12
View File
@@ -2,6 +2,18 @@ import MimeUtil from "./MimeUtil";
import StringUtil from "./StringUtil";
import Lang from "../model/global/Lang";
import CSV from "comma-separated-values";
import archiveSvg from "../../assets/image/file/archive.svg";
import audioSvg from "../../assets/image/file/audio.svg";
import docSvg from "../../assets/image/file/doc.svg";
import fileSvg from "../../assets/image/file/file.svg";
import folderSvg from "../../assets/image/file/folder.svg";
import imageSvg from "../../assets/image/file/image.svg";
import pdfSvg from "../../assets/image/file/pdf.svg";
import pptSvg from "../../assets/image/file/ppt.svg";
import psdSvg from "../../assets/image/file/psd.svg";
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 {
static isImage(name: string | null): boolean {
@@ -74,30 +86,30 @@ export default class FileUtil {
*/
static getIcon(name: string | null, idDir: boolean = false): any {
if (idDir) {
return require("../../assets/image/file/folder.svg");
return folderSvg;
}
if (FileUtil.isPdf(name)) {
return require("../../assets/image/file/pdf.svg");
return pdfSvg;
} else if (FileUtil.isDoc(name)) {
return require("../../assets/image/file/doc.svg");
return docSvg;
} else if (FileUtil.isPpt(name)) {
return require("../../assets/image/file/ppt.svg");
return pptSvg;
} else if (FileUtil.isXls(name)) {
return require("../../assets/image/file/xls.svg");
return xlsSvg;
} else if (FileUtil.isAudio(name)) {
return require("../../assets/image/file/audio.svg");
return audioSvg;
} else if (
FileUtil.isVideo(name) ||
MimeUtil.getExtension(name) === ".mkv"
) {
return require("../../assets/image/file/video.svg");
return videoSvg;
} else if (FileUtil.isText(name)) {
return require("../../assets/image/file/text.svg");
return textSvg;
} else if (FileUtil.isPsd(name)) {
return require("../../assets/image/file/psd.svg");
return psdSvg;
} else if (FileUtil.isImage(name)) {
return require("../../assets/image/file/image.svg");
return imageSvg;
} else if (
StringUtil.endWith(name, "zip") ||
StringUtil.endWith(name, "rar") ||
@@ -106,9 +118,9 @@ export default class FileUtil {
StringUtil.endWith(name, "tar") ||
StringUtil.endWith(name, "gz")
) {
return require("../../assets/image/file/archive.svg");
return archiveSvg;
} else {
return require("../../assets/image/file/file.svg");
return fileSvg;
}
}
src/pages/dashboard/Index.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import Matter from '../../common/model/matter/Matter';
import Lang from "../../common/model/global/Lang";
import MessageBoxUtil from "../../common/util/MessageBoxUtil";
src/pages/matter/List.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import SafeUtil from "../../common/util/SafeUtil";
import MatterSortPanel from "./widget/MatterSortPanel";
import {
src/pages/matter/widget/imageCache/ImageCachePanel.tsx
+1 -1
View File
@@ -11,7 +11,7 @@ import {
SmallDashOutlined,
} from "@ant-design/icons";
import MessageBoxUtil from "../../../../common/util/MessageBoxUtil";
import FileUtil from "../../../../common/util/FileUtil";
import FileUtil from "../../../../common/util/FileHelper";
import DateUtil from "../../../../common/util/DateUtil";
import Expanding from "../../../widget/Expanding";
import "./ImageCachePanel.less";
src/pages/preference/Edit.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import {FormInstance} from "antd/lib/form";
import MessageBoxUtil from "../../common/util/MessageBoxUtil";
import Sun from "../../common/model/global/Sun";
src/pages/preference/Index.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import ImagePreviewer from "../widget/previewer/ImagePreviewer";
import Lang from "../../common/model/global/Lang";
import SingleTextModal from "../widget/SingleTextModal";
src/pages/user/Detail.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import { UserStatus, UserStatusMap } from "../../common/model/user/UserStatus";
import BrowserUtil from "../../common/util/BrowserUtil";
import SingleTextModal from "../widget/SingleTextModal";
src/pages/user/Edit.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import TankContentCard from "../widget/TankContentCard";
import {FormInstance} from "antd/lib/form";
import {SaveOutlined} from "@ant-design/icons/lib";
src/pages/user/List.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../common/util/FileHelper";
import DateUtil from "../../common/util/DateUtil";
import FilterPanel from "../widget/filter/FilterPanel";
import TableEmpty from "../widget/TableEmpty";
src/pages/user/widget/MobileUserPanel.tsx
+1 -1
View File
@@ -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/FileUtil";
import FileUtil from "../../../common/util/FileHelper";
import {
UserStatus,
UserStatusMap,
src/pages/widget/previewer/BrowserPreviewer.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import "./BrowserPreviewer.less"
import React from "react";
import * as ReactDOM from 'react-dom';
import FileUtil from "../../../common/util/FileUtil";
import FileUtil from "../../../common/util/FileHelper";
import {CloseOutlined} from "@ant-design/icons";
interface IProps {
src/react-app-env.d.ts
Vendored
+1 -66
View File
@@ -1,69 +1,4 @@
/// <reference types="node" />
/// <reference types="react" />
/// <reference types="react-dom" />
declare namespace NodeJS {
interface ProcessEnv {
readonly NODE_ENV: 'development' | 'production' | 'test';
readonly PUBLIC_URL: string;
}
}
declare module '*.bmp' {
const src: string;
export default src;
}
declare module '*.gif' {
const src: string;
export default src;
}
declare module '*.jpg' {
const src: string;
export default src;
}
declare module '*.jpeg' {
const src: string;
export default src;
}
declare module '*.png' {
const src: string;
export default src;
}
declare module '*.webp' {
const src: string;
export default src;
}
declare module '*.svg' {
import * as React from 'react';
export const ReactComponent: React.FunctionComponent<React.SVGProps<
SVGSVGElement
> & { title?: string }>;
const src: string;
export default src;
}
declare module '*.module.css' {
const classes: { readonly [key: string]: string };
export default classes;
}
declare module '*.module.scss' {
const classes: { readonly [key: string]: string };
export default classes;
}
declare module '*.module.sass' {
const classes: { readonly [key: string]: string };
export default classes;
}
/// <reference types="react-scripts" />
declare module 'velocity-animate' {
import Velocity from 'velocity-animate';