diff --git a/docker-compose.yml b/docker-compose.yml index 9a3fe107..c132bb4c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: fileview: container_name: "dootask-fileview-${APP_ID}" - image: "kuaifan/fileview:4.1.0" + image: "kuaifan/fileview:4.1.0-SNAPSHOT" environment: TZ: "Asia/Shanghai" KK_CONTEXT_PATH: "/fileview" diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index b542f5ca..bda5b9d9 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -14,7 +14,7 @@ [{{$L('未保存')}}*] - {{formatName(file.name, file.type)}} + {{formatName(file)}}
-
+
@@ -106,10 +106,19 @@ export default { contentDetail: null, contentBak: {}, - editUser: [] + editUser: [], + + loadPreview: true, } }, + mounted() { + window.addEventListener('message', this.handleMessage) + }, + beforeDestroy() { + window.removeEventListener('message', this.handleMessage) + }, + watch: { file: { handler(info) { @@ -174,6 +183,10 @@ export default { return this.contentDetail && this.contentDetail.preview === true; }, + previewLoad() { + return this.isPreview && this.loadPreview === true; + }, + previewUrl() { if (this.isPreview) { return this.$store.state.method.apiUrl("../fileview/onlinePreview?url=" + encodeURIComponent(this.contentDetail.url)) @@ -184,6 +197,15 @@ export default { }, methods: { + handleMessage (event) { + const data = event.data; + switch (data.act) { + case 'ready': + this.loadPreview = false; + break + } + }, + getContent() { if (!this.fileId) { this.contentDetail = {}; @@ -287,13 +309,9 @@ export default { this.unsaveTip = false; }, - formatName(name, type) { - if (type == 'word') { - name += ".docx"; - } else if (type == 'excel') { - name += ".xlsx"; - } else if (type == 'ppt') { - name += ".pptx"; + formatName({name, ext}) { + if (ext != '') { + name += "." + ext; } return name; },