From 6765131dc62028a3f5d560ac3298c1f3be966cc5 Mon Sep 17 00:00:00 2001 From: ssc <273702440@qq.com> Date: Mon, 15 May 2023 13:23:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8D=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plugin/workflow/utils/watermark.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/views/plugin/workflow/utils/watermark.js b/src/views/plugin/workflow/utils/watermark.js index 098d4e7..9a483ff 100755 --- a/src/views/plugin/workflow/utils/watermark.js +++ b/src/views/plugin/workflow/utils/watermark.js @@ -24,14 +24,11 @@ watermark.set = (options = {}) => { watermarkId = defaultSettings.id //采用配置项替换默认值,作用类似jquery.extend - if (arguments.length === 1 && typeof arguments[0] === 'object') { - const src = arguments[0] || {} - for (let key in src) { - if (src[key] && defaultSettings[key] && src[key] === defaultSettings[key]) { - console.log() - } else if (src[key]) { - defaultSettings[key] = src[key] - } + for (let key in options) { + if (options[key] && defaultSettings[key] && options[key] === defaultSettings[key]) { + console.log() + } else if (options[key]) { + defaultSettings[key] = options[key] } }