From 0ec6d1e6324ae018027268529f456b2f1f5ae3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 16 Oct 2024 16:40:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-carousel/model-carousel-content.vue       |  2 +-
 .../model-data-magic/components/tabs-content.vue    |  2 +-
 src/components/model-img-magic/index.vue            | 13 ++++++++++---
 .../model-img-magic/model-img-magic-content.vue     |  2 +-
 .../model-img-magic/model-img-magic-styles.vue      |  8 ++++++++
 src/components/model-title/index.vue                |  8 +++++---
 src/components/model-title/model-title-styles.vue   |  3 +++
 src/config/const/img-magic.ts                       |  4 ++++
 src/config/const/title.ts                           |  4 +++-
 9 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 0c6f8407..11b9a909 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -14,7 +14,7 @@
                 <el-form-item label="图片设置">
                     <el-radio-group v-model="form.img_fit">
                         <el-radio value="contain">等比缩放</el-radio>
-                        <el-radio value="none">铺满</el-radio>
+                        <el-radio value="fill">铺满</el-radio>
                         <el-radio value="cover">等比剪切</el-radio>
                     </el-radio-group>
                 </el-form-item>
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index 647139d4..559712b5 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -18,7 +18,7 @@
             <el-form-item label="图片设置">
                 <el-radio-group v-model="form.img_fit">
                     <el-radio value="contain">等比缩放</el-radio>
-                    <el-radio value="none">铺满</el-radio>
+                    <el-radio value="fill">铺满</el-radio>
                     <el-radio value="cover">等比剪切</el-radio>
                 </el-radio-group>
             </el-form-item>
diff --git a/src/components/model-img-magic/index.vue b/src/components/model-img-magic/index.vue
index 0687505b..34cf35a2 100644
--- a/src/components/model-img-magic/index.vue
+++ b/src/components/model-img-magic/index.vue
@@ -19,9 +19,16 @@
                     </div>
                 </template>
                 <template v-else-if="form.style_actived == 10">
-                    <div v-for="(item, index) in form.img_magic_list" :key="index" :class="['img-spacing-border', { 'h': item.img.length > 0, 'style_actived_10': item.img.length == 0 }]" :style="selected_style(item)">
-                        <image-empty v-model="item.img[0]" :style="content_img_radius"></image-empty>
-                    </div>
+                    <template v-if="form.limit_size == '0'">
+                        <div v-for="(item, index) in form.img_magic_list" :key="index" :class="['img-spacing-border', { 'h': item.img.length > 0, 'style_actived_10': item.img.length == 0 }]" :style="selected_style(item)">
+                            <image-empty v-model="item.img[0]" :style="content_img_radius" fit="contain"></image-empty>
+                        </div>
+                    </template>
+                    <template v-else>
+                        <div v-for="(item, index) in form.img_magic_list" :key="index" class="img-spacing-border" :style="`${ selected_style(item) };height: ${ new_style.image_height }px;`">
+                            <image-empty v-model="item.img[0]" :style="content_img_radius" fit="contain"></image-empty>
+                        </div>
+                    </template>
                 </template>
                 <template v-else>
                     <div v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected img-spacing-border" :style="selected_style(item)">
diff --git a/src/components/model-img-magic/model-img-magic-content.vue b/src/components/model-img-magic/model-img-magic-content.vue
index 9ebf9706..37f75c16 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -13,7 +13,7 @@
                 <el-form-item v-if="form.style_actived !== 10" label="图片设置">
                     <el-radio-group v-model="form.img_fit">
                         <el-radio value="contain">等比缩放</el-radio>
-                        <el-radio value="none">铺满</el-radio>
+                        <el-radio value="fill">铺满</el-radio>
                         <el-radio value="cover">等比剪切</el-radio>
                     </el-radio-group>
                 </el-form-item>
diff --git a/src/components/model-img-magic/model-img-magic-styles.vue b/src/components/model-img-magic/model-img-magic-styles.vue
index 7c879a18..e8dffc66 100644
--- a/src/components/model-img-magic/model-img-magic-styles.vue
+++ b/src/components/model-img-magic/model-img-magic-styles.vue
@@ -9,6 +9,14 @@
                 <el-form-item label="图片圆角">
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
+                <template v-if="new_content.style_actived === 10">
+                    <el-form-item label="限制尺寸">
+                        <el-switch v-model="form.limit_size" active-value="1" inactive-value="0" />
+                    </el-form-item>
+                    <el-form-item v-if="form.limit_size == '1'" label="图片高度">
+                        <slider v-model="form.image_height" :max="500"></slider>
+                    </el-form-item>
+                </template>
             </card-container>
         </el-form>
         <div class="bg-f5 divider-line" />
diff --git a/src/components/model-title/index.vue b/src/components/model-title/index.vue
index 13c98ad6..55eb4a01 100644
--- a/src/components/model-title/index.vue
+++ b/src/components/model-title/index.vue
@@ -10,7 +10,7 @@
                         <template v-else-if="!isEmpty(form.icon_class)">
                             <icon :name="form.icon_class" :size="new_style.icon_size + ''" :color="new_style.icon_color"></icon>
                         </template>
-                        <div class="pr-15 nowrap" :style="title_style">{{ form.title || '标题' }}</div>
+                        <div class="pr-15 nowrap" :style="title_style">{{ form.title }}</div>
                     </div>
                     <div class="flex-row gap-10 align-c right-0 abs">
                         <template v-if="form.keyword_show == '1'">
@@ -84,6 +84,7 @@ const keyword_style = computed(() => {
 const right_style = computed(() => {
     return `color:${new_style.value.right_color}; font-size: ${new_style.value.right_size}px;`;
 });
+const title_img_height = computed(() => new_style.value.img_height + 'px');
 // 通用样式区
 const style_container = computed(() => common_styles_computer(new_style.value.common_style));
 const style_img_container = computed(() => common_img_computer(new_style.value.common_style));
@@ -99,7 +100,8 @@ const style_img_container = computed(() => common_img_computer(new_style.value.c
     word-wrap: break-word;
 }
 .title-img {
-    max-width: 6rem;
-    max-height: 3rem;
+    // max-width: 6rem;
+    // max-height: 3rem;
+    height: v-bind(title_img_height);
 }
 </style>
diff --git a/src/components/model-title/model-title-styles.vue b/src/components/model-title/model-title-styles.vue
index e04a45aa..88cb4f99 100644
--- a/src/components/model-title/model-title-styles.vue
+++ b/src/components/model-title/model-title-styles.vue
@@ -28,6 +28,9 @@
                         <slider v-model="form.title_size" :max="100"></slider>
                     </el-form-item>
                 </el-form-item>
+                <el-form-item label="图片高度">
+                    <slider v-model="form.img_height" :max="500"></slider>
+                </el-form-item>
             </card-container>
             <template v-if="!isEmpty(content.subtitle)">
                 <div class="bg-f5 divider-line" />
diff --git a/src/config/const/img-magic.ts b/src/config/const/img-magic.ts
index 1a52ff58..55f181f8 100644
--- a/src/config/const/img-magic.ts
+++ b/src/config/const/img-magic.ts
@@ -19,6 +19,8 @@ interface defaultSearch {
         radius_bottom_left: number;
         radius_bottom_right: number;
         image_spacing: number;
+        limit_size: boolean,
+        image_height: number;
         common_style: object;
     };
 }
@@ -49,6 +51,8 @@ const defaultSearch: defaultSearch = {
         radius_bottom_left: 0,
         radius_bottom_right: 0,
         image_spacing: 2,
+        limit_size: false,
+        image_height: 100,
         common_style: defaultCommon,
     },
 };
diff --git a/src/config/const/title.ts b/src/config/const/title.ts
index 99e0db76..80684056 100644
--- a/src/config/const/title.ts
+++ b/src/config/const/title.ts
@@ -25,6 +25,7 @@ interface defaultSearch {
         title_color: string;
         title_size: number;
         title_weight: string;
+        img_height: number;
         icon_size: number;
         icon_color: string;
         subtitle_color: string;
@@ -39,7 +40,7 @@ interface defaultSearch {
 }
 const defaultSearch: defaultSearch = {
     content: {
-        title: '',
+        title: '标题',
         title_link: {},
         img_src: [],
         icon_class: '',
@@ -62,6 +63,7 @@ const defaultSearch: defaultSearch = {
         title_color: '#000',
         title_size: 12,
         title_weight: 'normal',
+        img_height: 30,
         icon_size: 12,
         icon_color: '#999',
         subtitle_color: '#999',

From d80e27bbd8ad3daee010645886c1725574ef2d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 16 Oct 2024 16:43:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=AD=94=E6=96=B9=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-img-magic/model-img-magic-content.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/model-img-magic/model-img-magic-content.vue b/src/components/model-img-magic/model-img-magic-content.vue
index 37f75c16..4f1938aa 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -17,6 +17,11 @@
                         <el-radio value="cover">等比剪切</el-radio>
                     </el-radio-group>
                 </el-form-item>
+                <el-form-item v-else label="图片设置">
+                    <el-radio-group v-model="img_fit_10">
+                        <el-radio value="contain">等比缩放</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
             <card-container>
@@ -80,7 +85,7 @@ const props = defineProps({
     },
 });
 const style_list = ['heng2', 'shu2', 'shu3', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-1ge', 'a-4x4'];
-
+const img_fit_10 = 'contain';
 // 风格
 const style_show_list = [
     [{ start: {x: 1, y: 1}, end: {x: 4, y: 2}, img: [], img_link: {} }, { start: {x: 1, y: 3},end: {x: 4, y: 4},img: [], img_link: {}}], // 风格1

From ad36bb57e175f1098058e82412dce0599226b526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 16 Oct 2024 17:03:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=AD=94=E6=96=B9=E5=92=8C=E8=BD=AE=E6=92=AD=E5=9B=BE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-carousel/index.vue       |  2 +-
 .../model-carousel/model-carousel-content.vue |  3 +++
 .../model-carousel/model-carousel-styles.vue  | 19 ++++++++--------
 src/components/model-img-magic/index.vue      |  4 ++--
 .../model-img-magic-content.vue               | 22 ++++++++++++++-----
 .../model-img-magic-styles.vue                |  8 -------
 src/config/const/carousel.ts                  |  4 ++--
 src/config/const/img-magic.ts                 |  8 +++----
 8 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/components/model-carousel/index.vue b/src/components/model-carousel/index.vue
index fd5294da..92811e56 100644
--- a/src/components/model-carousel/index.vue
+++ b/src/components/model-carousel/index.vue
@@ -139,7 +139,7 @@ const seat_list = computed(() => {
     }
 })
 // 轮播图自适应高度 
-const newHeight = computed(() => new_style.value.height + 'px');
+const newHeight = computed(() => form.value.height + 'px');
 // 轮播图样式
 const interval_type = ref('');
 // 轮播图key值
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 11b9a909..9f21a097 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -24,6 +24,9 @@
                 <el-form-item v-if="form.is_roll == '1'" label="间隔时间">
                     <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                 </el-form-item>
+                <el-form-item label="高度设置">
+                    <slider v-model="form.height" :max="1000"></slider>
+                </el-form-item>
             </card-container>
             <div class="divider-line"></div>
             <card-container>
diff --git a/src/components/model-carousel/model-carousel-styles.vue b/src/components/model-carousel/model-carousel-styles.vue
index 2e439ef6..90c64b7b 100644
--- a/src/components/model-carousel/model-carousel-styles.vue
+++ b/src/components/model-carousel/model-carousel-styles.vue
@@ -7,16 +7,15 @@
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
             </card-container>
-            <div class="divider-line"></div>
-            <card-container>
-                <div class="mb-12">轮播设置</div>
-                <el-form-item label="高度设置">
-                    <slider v-model="form.height" :max="1000"></slider>
-                </el-form-item>
-                <el-form-item v-if="['oneDragOne', 'twoDragOne'].includes(new_content.carousel_type)" label="图片间距">
-                    <slider v-model="form.image_spacing" :max="100"></slider>
-                </el-form-item>
-            </card-container>
+            <template v-if="['oneDragOne', 'twoDragOne'].includes(new_content.carousel_type)">
+                <div class="divider-line"></div>
+                <card-container>
+                    <div class="mb-12">轮播设置</div>
+                    <el-form-item label="图片间距">
+                        <slider v-model="form.image_spacing" :max="100"></slider>
+                    </el-form-item>
+                </card-container>
+            </template>
             <div class="divider-line"></div>
             <card-container>
                 <carousel-indicator :value="form"></carousel-indicator>
diff --git a/src/components/model-img-magic/index.vue b/src/components/model-img-magic/index.vue
index 34cf35a2..9e8e6ac3 100644
--- a/src/components/model-img-magic/index.vue
+++ b/src/components/model-img-magic/index.vue
@@ -25,8 +25,8 @@
                         </div>
                     </template>
                     <template v-else>
-                        <div v-for="(item, index) in form.img_magic_list" :key="index" class="img-spacing-border" :style="`${ selected_style(item) };height: ${ new_style.image_height }px;`">
-                            <image-empty v-model="item.img[0]" :style="content_img_radius" fit="contain"></image-empty>
+                        <div v-for="(item, index) in form.img_magic_list" :key="index" class="img-spacing-border" :style="`${ selected_style(item) };height: ${ form.image_height }px;`">
+                            <image-empty v-model="item.img[0]" :style="content_img_radius" :fit="form.img_fit"></image-empty>
                         </div>
                     </template>
                 </template>
diff --git a/src/components/model-img-magic/model-img-magic-content.vue b/src/components/model-img-magic/model-img-magic-content.vue
index 4f1938aa..e37a257b 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -17,11 +17,23 @@
                         <el-radio value="cover">等比剪切</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item v-else label="图片设置">
-                    <el-radio-group v-model="img_fit_10">
-                        <el-radio value="contain">等比缩放</el-radio>
-                    </el-radio-group>
-                </el-form-item>
+                <template v-else>
+                    <el-form-item label="限制尺寸">
+                        <el-switch v-model="form.limit_size" active-value="1" inactive-value="0" />
+                    </el-form-item>
+                    <template v-if="form.limit_size == '1'">
+                        <el-form-item label="图片高度">
+                            <slider v-model="form.image_height" :max="500"></slider>
+                        </el-form-item>
+                        <el-form-item label="图片设置">
+                            <el-radio-group v-model="form.img_fit">
+                                <el-radio value="contain">等比缩放</el-radio>
+                                <el-radio value="fill">铺满</el-radio>
+                                <el-radio value="cover">等比剪切</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </template>
+                </template>
             </card-container>
             <div class="bg-f5 divider-line" />
             <card-container>
diff --git a/src/components/model-img-magic/model-img-magic-styles.vue b/src/components/model-img-magic/model-img-magic-styles.vue
index e8dffc66..7c879a18 100644
--- a/src/components/model-img-magic/model-img-magic-styles.vue
+++ b/src/components/model-img-magic/model-img-magic-styles.vue
@@ -9,14 +9,6 @@
                 <el-form-item label="图片圆角">
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
-                <template v-if="new_content.style_actived === 10">
-                    <el-form-item label="限制尺寸">
-                        <el-switch v-model="form.limit_size" active-value="1" inactive-value="0" />
-                    </el-form-item>
-                    <el-form-item v-if="form.limit_size == '1'" label="图片高度">
-                        <slider v-model="form.image_height" :max="500"></slider>
-                    </el-form-item>
-                </template>
             </card-container>
         </el-form>
         <div class="bg-f5 divider-line" />
diff --git a/src/config/const/carousel.ts b/src/config/const/carousel.ts
index cf4b7e55..e5dca746 100644
--- a/src/config/const/carousel.ts
+++ b/src/config/const/carousel.ts
@@ -14,6 +14,7 @@ interface defaultSearch {
         img_fit: string,
         is_roll: string;
         interval_time: number;
+        height: number,
     };
     style: {
         radius: number;
@@ -22,7 +23,6 @@ interface defaultSearch {
         radius_bottom_left: number;
         radius_bottom_right: number;
         is_show: string;
-        height: number,
         image_spacing: number,
         indicator_style: string;
         indicator_location: string;
@@ -53,6 +53,7 @@ const defaultSearch: defaultSearch = {
         img_fit: 'contain',
         is_roll: '1',
         interval_time: 3,
+        height: 300,
         carousel_list: [
             {
                 carousel_img: [],
@@ -81,7 +82,6 @@ const defaultSearch: defaultSearch = {
         radius_bottom_left: 0,
         radius_bottom_right: 0,
         is_show: '1',
-        height: 300,
         image_spacing: 10,
         indicator_style: 'dot',
         indicator_location: 'center',
diff --git a/src/config/const/img-magic.ts b/src/config/const/img-magic.ts
index 55f181f8..44d53d53 100644
--- a/src/config/const/img-magic.ts
+++ b/src/config/const/img-magic.ts
@@ -11,6 +11,8 @@ interface defaultSearch {
         style_actived: number;
         img_magic_list: img_magic[];
         img_fit: string;
+        limit_size: string,
+        image_height: number;
     };
     style: {
         radius: number;
@@ -19,8 +21,6 @@ interface defaultSearch {
         radius_bottom_left: number;
         radius_bottom_right: number;
         image_spacing: number;
-        limit_size: boolean,
-        image_height: number;
         common_style: object;
     };
 }
@@ -43,6 +43,8 @@ const defaultSearch: defaultSearch = {
             }
         ],
         img_fit: 'cover',
+        limit_size: '0',
+        image_height: 100,
     },
     style: {
         radius: 0,
@@ -51,8 +53,6 @@ const defaultSearch: defaultSearch = {
         radius_bottom_left: 0,
         radius_bottom_right: 0,
         image_spacing: 2,
-        limit_size: false,
-        image_height: 100,
         common_style: defaultCommon,
     },
 };