From b0b3a4b110ddd7612449b02cc91d6924dc5403fe Mon Sep 17 00:00:00 2001
From: wuchenguang1998 <wuchenguang1998@sina.com>
Date: Sat, 4 May 2024 13:14:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DColorPicker=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A2=9C=E8=89=B2=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/bgBar.vue     | 7 +++++--
 src/components/waterMark.vue | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/bgBar.vue b/src/components/bgBar.vue
index f6decb51..89d4b180 100644
--- a/src/components/bgBar.vue
+++ b/src/components/bgBar.vue
@@ -3,7 +3,7 @@
     <Divider orientation="left" plain>{{ $t('color') }}</Divider>
     <Form :label-width="40">
       <FormItem :label="$t('color')" prop="name">
-        <ColorPicker v-model="color" @on-change="setThisColor" alpha size="small" transfer />
+        <ColorPicker v-model="color" @on-change="setThisColor" alpha size="small" />
       </FormItem>
     </Form>
     <Divider orientation="left" plain>{{ $t('color_macthing') }}</Divider>
@@ -58,7 +58,7 @@ const colorList = computed(() => [
   },
 ]);
 
-const color = ref('');
+const color = ref('rgba(255, 255, 255, 1)');
 // 背景颜色设置
 const setThisColor = () => {
   setColor(color.value);
@@ -75,6 +75,9 @@ function setColor(color) {
 <style scoped lang="less">
 :deep(.ivu-form-item) {
   margin-bottom: 0;
+  .ivu-color-picker {
+    display: unset;
+  }
 }
 .img {
   width: 50px;
diff --git a/src/components/waterMark.vue b/src/components/waterMark.vue
index 328dcd93..6c5b3c32 100644
--- a/src/components/waterMark.vue
+++ b/src/components/waterMark.vue
@@ -42,7 +42,7 @@
     <div class="setting-item">
       <span class="mr-10px">{{ $t('waterMark.setting.color') }}</span>
 
-      <ColorPicker v-model="waterMarkState.color" alpha size="small" transfer />
+      <ColorPicker v-model="waterMarkState.color" alpha size="small" />
     </div>
     <div class="setting-item">
       <span class="mr-10px">{{ $t('waterMark.setting.position.label') }}</span>