Merge branch 'secondStage' into thirdStage

# Conflicts: # public/api_address_config.js # src/utils/kkFilePreview.js
2024-01-02 14:51:53 +08:00
parent d1430ef450 74e6cdba16
commit 9d25e63e14
4 changed files with 13 additions and 5 deletions
@@ -16,3 +16,8 @@ window._CONFIG.onlyOfficeUrl = 'http://127.0.0.1:8080'
 window._CONFIG.onlyOfficeDownloadFileUrl = 'http://localhost:8184/sys/common/download'
 // 管理员角色code，英文逗号拼接
 window._CONFIG.adminRoleCode = 'admin,BZGLY'
+// 水印配置
+window._CONFIG.watermarkConfig = {
+  color: 'rgba(180, 180, 180, 0.2)',
+  font: '13px Microsoft Yahei'
+}