From f48f2265d8202dcf4c60f99f945322c2da0111c2 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 11 Jun 2025 17:09:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Upload.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/admin/controller/v1/Upload.php b/app/admin/controller/v1/Upload.php
index dfc7cb92..c8ba0a66 100644
--- a/app/admin/controller/v1/Upload.php
+++ b/app/admin/controller/v1/Upload.php
@@ -155,27 +155,32 @@ class Upload
     {
         $config_model     = new \app\admin\controller\v1\SiteConfig;
         $watermark_config = $config_model->getByGroupUniqueLabel('watermark');
+
+        $opacity = data_get($watermark_config, 'watermark_opacity.value', 100);
+        if ($opacity == '') {
+            $opacity = 100;
+        }
         return [
             'enabled'      => data_get($watermark_config, 'watermark_enabled.value', 0) == 1,
             'type'         => data_get($watermark_config, 'watermark_type.value', ''),
             'text_options' => [
                 'txt'      => data_get($watermark_config, 'watermark_text_value.value', ''),
                 'font'     => data_get($watermark_config, 'watermark_text_font.value', ''),
-                'size'     => (float)data_get($watermark_config, 'watermark_text_size.value', 12),
-                'color'    => data_get($watermark_config, 'watermark_text_color.value', '#000000'),
-                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left'),
+                'size'     => (float)data_get($watermark_config, 'watermark_text_size.value', 12)?:12,
+                'color'    => data_get($watermark_config, 'watermark_text_color.value', '#000000')?:'#000000',
+                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left')?:'top-left',
                 'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0),
                 'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),
-                'opacity'  => (int)data_get($watermark_config, 'watermark_opacity.value', 100),
+                'opacity'  => (int)$opacity,
             ],
             'image_options' => [
                 'image'    => data_get($watermark_config, 'watermark_image_value.value', ''),
                 'width'    => (int)data_get($watermark_config, 'watermark_image_width.value')?:null,
                 'height'   => (int)data_get($watermark_config, 'watermark_image_height.value')?:null,
-                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left'),
+                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left')?:'top-left',
                 'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0),
                 'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),
-                'opacity'  => (int)data_get($watermark_config, 'watermark_opacity.value', 100),
+                'opacity'  => (int)$opacity,
             ]
         ];
     }