center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #7754 from dataease/pr@dev-v2@revert_screen

Browse Source 
revert: 回退多余提交
This commit is contained in:
王嘉豪 2024-01-23 10:00:41 +08:00 committed by GitHub
commit 1330253b02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/core-frontend/src/components/watermark/watermark.ts
View File

@ -41,17 +41,17 @@ export function watermark(settings, domId) {
// 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔 // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
if ( if (
defaultSettings.watermark_cols === 0 || defaultSettings.watermark_cols === 0 ||
Math.round( Math.floor(
defaultSettings.watermark_x + defaultSettings.watermark_x +
defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_width * defaultSettings.watermark_cols +
defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1) defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)
) > page_width ) > page_width
) { ) {
defaultSettings.watermark_cols = Math.round( defaultSettings.watermark_cols = Math.floor(
(page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /
(defaultSettings.watermark_width + defaultSettings.watermark_x_space) (defaultSettings.watermark_width + defaultSettings.watermark_x_space)
) )
defaultSettings.watermark_x_space = Math.round( defaultSettings.watermark_x_space = Math.floor(
(page_width - (page_width -
defaultSettings.watermark_x - defaultSettings.watermark_x -
defaultSettings.watermark_width * defaultSettings.watermark_cols) / defaultSettings.watermark_width * defaultSettings.watermark_cols) /
@ -61,17 +61,17 @@ export function watermark(settings, domId) {
// 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔 // 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
if ( if (
defaultSettings.watermark_rows === 0 || defaultSettings.watermark_rows === 0 ||
Math.round( Math.floor(
defaultSettings.watermark_y + defaultSettings.watermark_y +
defaultSettings.watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_height * defaultSettings.watermark_rows +
defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1) defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)
) > page_height ) > page_height
) { ) {
defaultSettings.watermark_rows = Math.round( defaultSettings.watermark_rows = Math.floor(
(defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) /
(defaultSettings.watermark_height + defaultSettings.watermark_y_space) (defaultSettings.watermark_height + defaultSettings.watermark_y_space)
) )
defaultSettings.watermark_y_space = Math.round( defaultSettings.watermark_y_space = Math.floor(
(page_height - (page_height -
defaultSettings.watermark_y - defaultSettings.watermark_y -
defaultSettings.watermark_height * defaultSettings.watermark_rows) / defaultSettings.watermark_height * defaultSettings.watermark_rows) /
@ -110,7 +110,7 @@ export function watermark(settings, domId) {
mask_div.style.zIndex = '10' mask_div.style.zIndex = '10'
// 让水印不遮挡页面的点击事件 // 让水印不遮挡页面的点击事件
mask_div.style.pointerEvents = 'none' mask_div.style.pointerEvents = 'none'
mask_div.style.opacity = defaultSettings.watermark_alpha + '' mask_div.style.opacity = defaultSettings.watermark_alpha
mask_div.style.fontSize = defaultSettings.watermark_fontsize mask_div.style.fontSize = defaultSettings.watermark_fontsize
mask_div.style.fontFamily = defaultSettings.watermark_font mask_div.style.fontFamily = defaultSettings.watermark_font
mask_div.style.color = defaultSettings.watermark_color mask_div.style.color = defaultSettings.watermark_color

2
de-xpack

@ -1 +1 @@
Subproject commit 19d1cc14aaa7ff5297ebe8f3b8ea3c706f164cc3 Subproject commit a30164b304688249585d2d9af53502a3a67211d2