cloud-web-corejs 1.0.54-dev.4 → 1.0.54-dev.6

package/src/components/fileLibrary/index.vue

@@ -192,7 +192,7 @@
                         href="javascript:void(0);"
                         class="a-link ico"
                         v-if="!attachment.dirs && fileObjAuth.downloadAuth"
-                        @click="$commonFileUtil.downloadFile(attachment.domain + attachment.url, attachment.fileName)"
+                        @click="downloadSingerFile(attachment)"
                       >
                         <el-tooltip effect="dark" content="下载" placement="top"
                                     popper-class="tooltip-skin">
@@ -353,7 +353,7 @@
                   href="javascript:void(0);"
                   class="a-link"
                   v-if="fileObjAuth.downloadAuth == 1"
-                  @click="$commonFileUtil.downloadFile(row.domain + row.url,row.fileName)"
+                  @click="downloadSingerFile(row)"
                 >
                   <el-tooltip :enterable="false" effect="dark" :content="$t2('下载','components.fileLibrary.download')"
                               placement="top"

package/src/components/fileLibrary/mixins/fileObjAuthDialogMixin.js

@@ -284,6 +284,19 @@ modules = {
               }
             }
           },
+          {
+            title: this.$t1('下载打水印 '),
+            field: 'downWatermarkAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-switch v-model={row.downWatermarkAuth} active-value={1} inactive-value={0}
+                             disabled={row._isParent}></el-switch>
+                ];
+              }
+            }
+          },
           {title: this.$t2('创建人', 'system.label.createBy'), field: 'createBy', width: 150},
           {title: this.$t2('创建时间', 'system.label.createDate'), field: 'createDate', width: 150},
           {title: this.$t2('更新人', 'system.label.modifyBy'), field: 'modifyBy', width: 150},

package/src/components/fileLibrary/mixins/indexMixins.js

@@ -7,6 +7,7 @@ import shareDialog from "../shareDialog";
 import recycleBinDialog from "../recycleBinDialog";
 import videoDialog from "../../../components/video/dialog";
 import userDialog from "../../../views/user/user/dialog";
+import {encode} from "js-base64";
 
 let modules;
 modules = {
@@ -1746,6 +1747,16 @@ modules = {
       } else {
         return customFileButton.visable;
       }
+    },
+    downloadSingerFile(attachment) {
+      let fileObjAuth = this.fileObjAuth;
+      if (attachment.dirs || !fileObjAuth.downloadAuth) return
+      let url = attachment.domain + attachment.url;
+      let loginAccount = this.$store.getters.loginAccount;
+      if (fileObjAuth.downWatermarkAuth) {
+        url += '?_w=' + encode(loginAccount)
+      }
+      this.$commonFileUtil.downloadFile(url, attachment.fileName)
     }
   },
 };

package/src/layout/components/notify_message/unreadDialog.vue

@@ -118,6 +118,8 @@ export default {
     },
     initSystemNoticeInfoDialog() {
       if (!settingConfig.systemNoticeAutoTip) return
+      let userFlag = this.$store.getters.userFlag
+      if (userFlag == 6 || userFlag == 7 || userFlag == 8) return;
       this.$http({
         url: USER_PREFIX + '/system_notice/listPage',
         data: {publish: true, important: true, readed: 0, size: 1},