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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=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',