From 886d4a19611c3294b97ff4c833bae6c1c2fbbb70 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 17 Oct 2022 17:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/CollectionType/index.vue     |  6 +++++-
 .../src/components/uploadFileChangeDown/file.vue     | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 2f8d6386c..2b59628ee 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -652,7 +652,7 @@
       </div>
     </div>
     <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
-                          :detailDate='detailDate'></uploadFileChangeDown>
+                          :detailDate='detailDate' watermark='download'></uploadFileChangeDown>
   </div>
 </template>
 
@@ -667,6 +667,10 @@
         type: Object,
         default: {},
         require: true
+      },
+      watermark: {
+        type: String,
+        default: ''
       }
     },
     data() {
diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue
index e742821cb..19b236668 100644
--- a/jero-web/src/components/uploadFileChangeDown/file.vue
+++ b/jero-web/src/components/uploadFileChangeDown/file.vue
@@ -43,7 +43,7 @@ import { mapGetters } from 'vuex'
 
   export default {
     name: 'file',
-    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate'],
+    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate','watermark'],
     data() {
       return {
         visible: false,
@@ -91,7 +91,11 @@ import { mapGetters } from 'vuex'
   methods: {
     ...mapGetters(['userInfo']),
     download() {
-      downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', this.template.templateName, { id: this.template.templateId })
+      } else {
+        downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      }
     },
     perentHandleFunc(data) {
       this.myfileList = data
@@ -220,7 +224,11 @@ import { mapGetters } from 'vuex'
       //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
       //   window.open(url, '_blank')
       // } else {
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', fileQuery.fileName, { id: fileQuery.id })
+      }else {
         downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+      }
       // }
     }
   }