From cc8d2c8729f74b153400a11ebcb012d803f3b3e6 Mon Sep 17 00:00:00 2001 From: lishuang Date: Sat, 13 Jun 2020 00:44:56 +0800 Subject: [PATCH] Finis the preview feature. --- src/common/model/matter/Matter.ts | 62 ++++++++----------- .../widget/previewer/BrowserPreviewer.less | 5 +- .../widget/previewer/BrowserPreviewer.tsx | 1 - 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/src/common/model/matter/Matter.ts b/src/common/model/matter/Matter.ts index 64d3058..5013d3f 100644 --- a/src/common/model/matter/Matter.ts +++ b/src/common/model/matter/Matter.ts @@ -14,6 +14,7 @@ import NumberUtil from "../../util/NumberUtil"; import SafeUtil from "../../util/SafeUtil"; import ImagePreviewer from "../../../pages/widget/previewer/ImagePreviewer"; import BrowserPreviewer from "../../../pages/widget/previewer/BrowserPreviewer"; +import MessageBoxUtil from "../../util/MessageBoxUtil"; export default class Matter extends BaseEntity { puuid: string = ""; @@ -184,46 +185,35 @@ export default class Matter extends BaseEntity { ImagePreviewer.showSinglePhoto(previewUrl) - } else if (that.isPdf()) { + } else if (that.isPdf() || that.isText() || that.isAudio() || that.isVideo()) { BrowserPreviewer.show(that.name, previewUrl, that.size) + } else if (that.isDoc() || that.isPpt() || that.isXls()) { + + + MessageBoxUtil.warning("Office的预览还没做好") + // //如果是分享中的预览,直接就可以公有访问。 + // if (shareMode) { + // Vue.$previewer.previewOffice(that.name, previewUrl, that.size) + // } else { + // + // //如果是共有文件 office文件的预览请求一次性链接。 + // if (this.privacy) { + // + // let downloadToken = new DownloadToken() + // downloadToken.httpFetchDownloadToken(that.uuid, function () { + // Vue.$previewer.previewOffice(that.name, that.getPreviewUrl(downloadToken.uuid), that.size) + // }) + // } else { + // Vue.$previewer.previewOffice(that.name, previewUrl, that.size) + // } + // } + + + } else { + window.open(this.getPreviewUrl()) } - // } else if (that.isDoc() || that.isPpt() || that.isXls()) { - // - // //如果是分享中的预览,直接就可以公有访问。 - // if (shareMode) { - // Vue.$previewer.previewOffice(that.name, previewUrl, that.size) - // } else { - // - // //如果是共有文件 office文件的预览请求一次性链接。 - // if (this.privacy) { - // - // let downloadToken = new DownloadToken() - // downloadToken.httpFetchDownloadToken(that.uuid, function () { - // Vue.$previewer.previewOffice(that.name, that.getPreviewUrl(downloadToken.uuid), that.size) - // }) - // } else { - // Vue.$previewer.previewOffice(that.name, previewUrl, that.size) - // } - // } - // - // - // } else if (that.isText()) { - // - // Vue.$previewer.previewText(that.name, previewUrl, that.size) - // - // } else if (that.isAudio()) { - // - // Vue.$previewer.previewAudio(that.name, previewUrl, that.size) - // - // } else if (that.isVideo()) { - // - // Vue.$previewer.previewVideo(that.name, previewUrl, that.size) - // - // } else { - // window.open(this.getPreviewUrl()) - // } } httpCreateDirectory( diff --git a/src/pages/widget/previewer/BrowserPreviewer.less b/src/pages/widget/previewer/BrowserPreviewer.less index d247386..9962c25 100644 --- a/src/pages/widget/previewer/BrowserPreviewer.less +++ b/src/pages/widget/previewer/BrowserPreviewer.less @@ -7,8 +7,7 @@ left: 0; z-index: 1000; - background: #333; - color: #eee; + background: white; display: flex; flex-direction: column; @@ -19,7 +18,7 @@ text-align: center; line-height: 40px; font-size: 16px; - border-bottom: 1px solid #555; + border-bottom: 1px solid #eee; .close { float: right; diff --git a/src/pages/widget/previewer/BrowserPreviewer.tsx b/src/pages/widget/previewer/BrowserPreviewer.tsx index c9a5b1a..444920c 100644 --- a/src/pages/widget/previewer/BrowserPreviewer.tsx +++ b/src/pages/widget/previewer/BrowserPreviewer.tsx @@ -3,7 +3,6 @@ import React from "react"; import * as ReactDOM from 'react-dom'; import FileUtil from "../../../common/util/FileUtil"; import {CloseOutlined} from "@ant-design/icons"; -import {Tooltip} from "antd"; interface IProps { name: string