修复角色组设置水印模式，无法选择「动态生成」的 bug (Fixed #502)

lsky-org · Aug 17, 2022 · b6f5f24 · b6f5f24
1 parent f49f52d
commit b6f5f24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Http/Requests/Admin/GroupRequest.php b/app/Http/Requests/Admin/GroupRequest.php
@@ -64,7 +64,7 @@ public function rules()
             'configs.image_cache_ttl' => 'nullable|numeric',
 
             'configs.is_enable_watermark' => 'boolean',
-            'configs.watermark_configs.mode' => ['exclude_if:configs.is_enable_watermark,false', 'in:1,2'],
+            'configs.watermark_configs.mode' => ['in:1,2'],
             'configs.watermark_configs.driver' => ['exclude_if:configs.is_enable_watermark,false', 'in:font,image'],
             'configs.watermark_configs.drivers.font.font' => [
                 $requiredIfWatermark('font'),

diff --git a/resources/views/admin/group/edit.blade.php b/resources/views/admin/group/edit.blade.php
@@ -210,7 +210,7 @@
                                 <div class="col-span-6 mt-4 mb-4">
                                     <x-fieldset title="水印模式">
                                         <x-fieldset-radio id="configs[watermark_configs][mode]_overlay" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Overlay }}" :checked="($group->configs['watermark_configs']['mode'] ?? '') == \App\Enums\Watermark\Mode::Overlay">覆盖原图</x-fieldset-radio>
-                                        <x-fieldset-radio id="configs[watermark_configs][mode]_dynamic" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Dynamic }}" :checked="($group->configs['watermark_configs']['dynamic'] ?? '') == \App\Enums\Watermark\Mode::Dynamic">动态生成</x-fieldset-radio>
+                                        <x-fieldset-radio id="configs[watermark_configs][mode]_dynamic" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Dynamic }}" :checked="($group->configs['watermark_configs']['mode'] ?? '') == \App\Enums\Watermark\Mode::Dynamic">动态生成</x-fieldset-radio>
                                     </x-fieldset>
                                 </div>
                                 <div class="col-span-6 mt-4 mb-4">