From 1c45e92c91658e2688253c44ab91a54280973163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 13 Aug 2024 09:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-custom/components/index.vue         | 21 ++++++++++++-------
 .../model-custom/model-custom-content.vue     |  2 +-
 src/layout/components/main/default/custom.ts  |  6 +++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index 53398db1..66173abf 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -17,7 +17,7 @@
         </card-container>
         <card-container class="mb-8">
             <div class="mb-12">内容设置</div>
-            <slider v-model="center_height" :max="10000">组件高度</slider>
+            <slider v-model="center_height" :max="3000">组件高度</slider>
         </card-container>
         <card-container class="h selected">
             <div class="mb-12">已选组件</div>
@@ -25,7 +25,7 @@
                 <div v-if="!isEmpty(diy_data)" class="flex-row flex-wrap gap-10">
                     <div v-for="(item, index) in diy_data" :key="index" class="item flex jc-sb align-c size-14 cr-3" :class="{ 'item-active': item.show_tabs }" @click="on_choose(index, item.show_tabs)">{{ item.name }}<icon name="close" color="3" size="10" class="c-pointer" @click="del(index)"></icon></div>
                 </div>
-                <NoData v-else :imgWidth="10"></NoData>
+                <NoData v-else :img-width="10"></NoData>
             </div>
         </card-container>
     </div>
@@ -85,6 +85,9 @@ const components = reactive([
                 key: 'text',
                 name: '文本',
                 com_data: {
+                    com_width: 150,
+                    com_height: 17,
+                    staging_height: 17,
                     text_title: '文本',
                     data_source_id: '',
                     data_source_list: {},
@@ -113,8 +116,6 @@ const components = reactive([
                         radius_bottom_right: 0,
                     },
                     border_size: 1,
-                    com_width: 150,
-                    com_height: 17,
                     com_bg: '',
                     bottom_up: true,
                 },
@@ -123,8 +124,9 @@ const components = reactive([
                 key: 'img',
                 name: '图片',
                 com_data: {
-                    com_width: 52,
-                    com_height: 52,
+                    com_width: 50,
+                    com_height: 50,
+                    staging_height: 50,
                     img_src: [],
                     data_source_id: '',
                     data_source_list: {},
@@ -139,7 +141,7 @@ const components = reactive([
                     img_width: 50,
                     img_height: 50,
                     img_rotate: 0,
-                    border_show: true,
+                    border_show: false,
                     border_color: '#FF3F3F',
                     border_style: 'dashed',
                     border_radius: {
@@ -159,6 +161,7 @@ const components = reactive([
                 com_data: {
                     com_width: 306,
                     com_height: 11,
+                    staging_height: 11,
                     line_settings: 'horizontal',
                     line_style: 'solid',
                     line_width: 306,
@@ -260,6 +263,10 @@ watch(() => center_height.value, () => {
                 y: item.location.staging_y,
                 staging_y: item.location.staging_y,
             },
+            com_data: {
+                ...item.com_data,
+                com_height: item.com_data.staging_height,
+            }
         }));
     });
 },{ immediate: true, deep: true });
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 6125fad4..ebaa78ce 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -26,7 +26,7 @@
                         <model-lines-style :key="key" v-model:height="center_height" :value="diy_data"></model-lines-style>
                     </template>
                     <template v-else>
-                        <NoData :imgWidth="10"></NoData>
+                        <NoData :img-width="10"></NoData>
                     </template>
                 </div>
             </div>
diff --git a/src/layout/components/main/default/custom.ts b/src/layout/components/main/default/custom.ts
index 5cfda894..29e8de7b 100644
--- a/src/layout/components/main/default/custom.ts
+++ b/src/layout/components/main/default/custom.ts
@@ -1,3 +1,4 @@
+import { de } from "element-plus/es/locale";
 import defaultCommon from "./index";
 
 interface defaultSearch {
@@ -17,7 +18,10 @@ const defaultSearch: defaultSearch = {
         custom_list: []
     },
     style: {
-        common_style: defaultCommon
+        common_style: {
+            ...defaultCommon,
+            color_list: ['rgb(244, 252, 255)'],
+        }
     },
 };