From 6391900a9703b35e4b0197bb254d9591ee5cabb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 10 Apr 2025 18:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98=E5=90=8C?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-title/index.vue               | 4 ++--
 src/components/model-title/model-title-content.vue | 3 +++
 src/components/model-title/model-title-styles.vue  | 3 ---
 src/config/const/title.ts                          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/model-title/index.vue b/src/components/model-title/index.vue
index 7d936a85..cf7056a4 100644
--- a/src/components/model-title/index.vue
+++ b/src/components/model-title/index.vue
@@ -11,7 +11,7 @@
                             <icon :name="form.icon_class" :size="new_style.icon_size + ''" :color="new_style.icon_color"></icon>
                         </template>
                         <div v-if="!isEmpty(form.title)" class="nowrap" :style="title_style">{{ form.title }}</div>
-                        <div v-if="!isEmpty(form.subtitle) && new_style.title_line == '1'" class="text-word-break nowrap" :style="subtitle_style">{{ form.subtitle }}</div>
+                        <div v-if="!isEmpty(form.subtitle) && form.title_line == '1'" class="text-word-break nowrap" :style="subtitle_style">{{ form.subtitle }}</div>
                     </div>
                     <div class="flex-row gap-10 align-c right-0 abs">
                         <template v-if="form.keyword_show == '1'">
@@ -24,7 +24,7 @@
                         <div v-if="form.right_show == '1'" class="nowrap" :style="right_style">{{ form.right_title }}<el-icon class="iconfont icon-arrow-right" :color="new_style.right_color || '#999'"></el-icon></div>
                     </div>
                 </div>
-                <div v-if="!isEmpty(form.subtitle) && new_style.title_line != '1'" class="text-word-break" :style="subtitle_style">{{ form.subtitle }}</div>
+                <div v-if="!isEmpty(form.subtitle) && form.title_line != '1'" class="text-word-break" :style="subtitle_style">{{ form.subtitle }}</div>
             </div>
         </div>
     </div>
diff --git a/src/components/model-title/model-title-content.vue b/src/components/model-title/model-title-content.vue
index e4ca09e1..33d05d11 100644
--- a/src/components/model-title/model-title-content.vue
+++ b/src/components/model-title/model-title-content.vue
@@ -23,6 +23,9 @@
                 <el-form-item label="副标题居中">
                     <el-switch v-model="form.is_subtitle_center" active-value="1" inactive-value="0"/>
                 </el-form-item>
+                <el-form-item label="标题同行">
+                    <el-switch v-model="form.title_line" active-value="1" inactive-value="0" />
+                </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
             <card-container>
diff --git a/src/components/model-title/model-title-styles.vue b/src/components/model-title/model-title-styles.vue
index 16b23e0e..f70bf670 100644
--- a/src/components/model-title/model-title-styles.vue
+++ b/src/components/model-title/model-title-styles.vue
@@ -47,9 +47,6 @@
                             </el-form-item>
                         </div>
                     </el-form-item>
-                    <el-form-item label="标题同行">
-                        <el-switch v-model="form.title_line" active-value="1" inactive-value="0" />
-                    </el-form-item>
                 </template>
             </card-container>
             <div class="bg-f5 divider-line" />
diff --git a/src/config/const/title.ts b/src/config/const/title.ts
index 1a5d4a66..ecb970a8 100644
--- a/src/config/const/title.ts
+++ b/src/config/const/title.ts
@@ -18,6 +18,7 @@ interface defaultSearch {
         subtitle: string;
         is_title_center: string;
         is_subtitle_center: string;
+        title_line: string;
         keyword_show: string;
         keyword_list: carousel_list[];
         right_show: string;
@@ -34,7 +35,6 @@ interface defaultSearch {
         subtitle_color: string;
         subtitle_size: number;
         subtitle_weight: string;
-        title_line: string;
         keyword_color: string;
         keyword_size: number;
         keyword_spacing: number;
@@ -59,6 +59,7 @@ const defaultSearch: defaultSearch = {
         // 内容居中
         is_title_center: '0',
         is_subtitle_center: '0',
+        title_line: '0',
         // 右侧内容设置
         right_show: '1',
         right_title: '更多',
@@ -89,7 +90,6 @@ const defaultSearch: defaultSearch = {
         subtitle_color: '#999',
         subtitle_size: 12,
         subtitle_weight: 'normal',
-        title_line: '0',
         // 关键字设置
         keyword_color: '#000',
         keyword_size: 12,