From 6056785be728edac5280d5eb4ee9b4967f30e0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 3 Mar 2025 10:00:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-tabs/model-article-tabs-content.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 0ba008a0..5c0d02f1 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -227,8 +227,8 @@ const article_theme_change = (val: any) => {
     const list = base_list.article_theme_list.filter(item => item.value == val);
     if (list.length > 0) {
         // emits('theme_change', list[0].width, list[0].height);
-        styles.value.content_img_width = list[0].width;
-        styles.value.content_img_height = list[0].height;
+        styles.content_img_width = list[0].width;
+        styles.content_img_height = list[0].height;
     }
 };
 

From e4f29ce4d7a43c7292f99bfc03d7922a3a426474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 11:29:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=B0=81=E8=A3=85?=
 =?UTF-8?q?=E6=88=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/sliding-fixed/index.vue          |  4 +---
 src/components/common/background-common/index.vue    |  4 +---
 src/components/common/carousel-indicator/index.vue   |  4 +---
 .../common/data-tabs-common/data-custom-content.vue  |  4 +---
 src/components/common/filter-form/index.vue          |  4 +---
 .../model-article-tabs-content.vue                   |  8 ++------
 src/components/model-custom/model-custom-content.vue |  4 +---
 .../model-data-tabs/model-data-tabs-content.vue      |  8 ++------
 .../model-goods-tabs/model-goods-tabs-content.vue    |  8 ++------
 src/components/model-tabs/model-tabs-content.vue     | 12 +++---------
 src/components/page-settings/page-styles.vue         | 12 +++---------
 11 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/src/components/base/sliding-fixed/index.vue b/src/components/base/sliding-fixed/index.vue
index ea9fe4de..12c9c682 100644
--- a/src/components/base/sliding-fixed/index.vue
+++ b/src/components/base/sliding-fixed/index.vue
@@ -2,9 +2,7 @@
     <el-form-item label="滑动固定" class="w mb-10">
         <div class="flex-row w h">
             <el-switch v-model="is_sliding_fixed" class="mr-10" active-value="1" inactive-value="0" @change="sliding_fixed_change" />
-            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>1. 选项卡背景建议设置单纯色、多色或图片会造成背景不吻合。<br/> 2. 仅支持一个选项卡数据固定、开启后其他项将自动关闭。<br/>3.元素滑动到最左侧的时候固定。</span>" raw-content placement="top">
-                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-            </el-tooltip>
+            <tooltip content="<span>1. 选项卡背景建议设置单纯色、多色或图片会造成背景不吻合。<br/> 2. 仅支持一个选项卡数据固定、开启后其他项将自动关闭。<br/>3.元素滑动到最左侧的时候固定。</span>"></tooltip>
         </div>
     </el-form-item>
 </template>
diff --git a/src/components/common/background-common/index.vue b/src/components/common/background-common/index.vue
index 1a89af88..e34736f8 100644
--- a/src/components/common/background-common/index.vue
+++ b/src/components/common/background-common/index.vue
@@ -2,9 +2,7 @@
     <div class="flex-col gap-10 w">
         <div class="size-12 flex-row gap-10">
             <span>背景色</span>
-            <el-tooltip effect="dark" :show-after="200" :hide-after="200" :content="props.tooltipContent" raw-content placement="top">
-                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-            </el-tooltip>
+            <tooltip :content="props.tooltipContent"></tooltip>
         </div>
         <mult-color-picker :value="color_list" :type="direction" @update:value="mult_color_picker_event"></mult-color-picker>
         <div class="flex-row jc-sb align-c is-newline">
diff --git a/src/components/common/carousel-indicator/index.vue b/src/components/common/carousel-indicator/index.vue
index 7db034e3..16f15dbd 100644
--- a/src/components/common/carousel-indicator/index.vue
+++ b/src/components/common/carousel-indicator/index.vue
@@ -3,9 +3,7 @@
     <el-form-item label="是否显示">
         <div class="flex-row gap-10">
             <el-switch v-model="form.is_show" active-value="1" inactive-value="0" @change="operation_end"/>
-            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="当数据只有一屏的时候不展示指示器" raw-content placement="top">
-                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-            </el-tooltip>
+            <tooltip content="当数据只有一屏的时候不展示指示器"></tooltip>
         </div>
     </el-form-item>
     <template v-if="form.is_show == '1'">
diff --git a/src/components/common/data-tabs-common/data-custom-content.vue b/src/components/common/data-tabs-common/data-custom-content.vue
index 8e10af33..659348cd 100644
--- a/src/components/common/data-tabs-common/data-custom-content.vue
+++ b/src/components/common/data-tabs-common/data-custom-content.vue
@@ -19,9 +19,7 @@
                                 <el-radio value="1">是</el-radio>
                                 <el-radio value="0">否</el-radio>
                             </el-radio-group>
-                            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="1. 是的情况下，第一层自定义自动循环动态数据，编组可以使用循环项数据或其中的列表数据。<br/>2. 否的情况下，第一层自定义不能使用当前动态数据，只能在编组里面选择使用。" raw-content placement="top">
-                                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                            </el-tooltip>
+                            <tooltip content="1. 是的情况下，第一层自定义自动循环动态数据，编组可以使用循环项数据或其中的列表数据。<br/>2. 否的情况下，第一层自定义不能使用当前动态数据，只能在编组里面选择使用。"></tooltip>
                         </div>
                     </el-form-item>
                 </template>
diff --git a/src/components/common/filter-form/index.vue b/src/components/common/filter-form/index.vue
index 073c4fc9..1872557d 100644
--- a/src/components/common/filter-form/index.vue
+++ b/src/components/common/filter-form/index.vue
@@ -9,9 +9,7 @@
                             <div class="flex-row gap-10">
                                 <el-cascader v-model="new_dataInterface[item.form_name]" :placeholder="placeholder_config(item, 'select')" :show-all-levels="false" filterable clearable class="w h" collapse-tags popper-class="filter-form-cascader" :placement="+item?.config?.is_level == 1 && props.direction == 'vertical' ? 'left' : 'bottom'" :props="{'multiple': +item?.config?.is_multiple == 1, 'checkStrictly': true, 'emitPath': false, 'value': item?.data_key || 'id', 'label': item?.data_name || 'name', 'children': item?.config?.children || '' }" :options="selectData(item)" /> 
                                 <template v-if="+item?.config?.is_multiple == 1">
-                                    <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="父级选中包含所有子级" raw-content placement="top">
-                                        <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                                    </el-tooltip>
+                                    <tooltip content="父级选中包含所有子级"></tooltip>
                                 </template>
                             </div>
                         </template>
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 5c0d02f1..4883aded 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -15,18 +15,14 @@
                 <el-form-item label="选项卡置顶">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.tabs_top_up" active-value="1" inactive-value="0" />
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>滑动置顶仅手机端有效</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="1.滑动置顶仅手机端有效<br/>2.滑动置顶后通用的圆角不生效"></tooltip>
                     </div>
                 </el-form-item>
                 <template v-if="form.tabs_top_up == '1' && is_not_general_safe_distance">
                     <el-form-item label="安全距离">
                         <div class="flex-row align-c gap-10">
                             <el-switch v-model="form.is_general_safe_distance" active-value="1" inactive-value="0" />
-                            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>选项卡置顶是否需要安全距离</span>" raw-content placement="top">
-                                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                            </el-tooltip>
+                            <tooltip content="选项卡置顶是否需要安全距离"></tooltip>
                         </div>
                     </el-form-item>
                 </template>
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 467286ba..0bf2a458 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -19,9 +19,7 @@
                                 <el-radio value="1">是</el-radio>
                                 <el-radio value="0">否</el-radio>
                             </el-radio-group>
-                            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="1. 是的情况下，第一层自定义自动循环动态数据，编组可以使用循环项数据或其中的列表数据。<br/>2. 否的情况下，第一层自定义不能使用当前动态数据，只能在编组里面选择使用。" raw-content placement="top">
-                                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                            </el-tooltip>
+                            <tooltip content="1.是的情况下，第一层自定义自动循环动态数据，编组可以使用循环项数据或其中的列表数据。<br/>2.否的情况下，第一层自定义不能使用当前动态数据，只能在编组里面选择使用。"></tooltip>
                         </div>
                     </el-form-item>
                 </template>
diff --git a/src/components/model-data-tabs/model-data-tabs-content.vue b/src/components/model-data-tabs/model-data-tabs-content.vue
index 698cf308..99f9aaf1 100644
--- a/src/components/model-data-tabs/model-data-tabs-content.vue
+++ b/src/components/model-data-tabs/model-data-tabs-content.vue
@@ -15,18 +15,14 @@
                 <el-form-item label="置顶">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.tabs_top_up" active-value="1" inactive-value="0" />
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>滑动置顶仅手机端有效</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="1.滑动置顶仅手机端有效<br/>2.滑动置顶后通用的圆角不生效"></tooltip>
                     </div>
                 </el-form-item>
                 <template v-if="form.tabs_top_up == '1' && is_not_general_safe_distance">
                     <el-form-item label="安全距离">
                         <div class="flex-row align-c gap-10">
                             <el-switch v-model="form.is_general_safe_distance" active-value="1" inactive-value="0" />
-                            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>选项卡置顶是否需要安全距离</span>" raw-content placement="top">
-                                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                            </el-tooltip>
+                            <tooltip content="选项卡置顶是否需要安全距离"></tooltip>
                         </div>
                     </el-form-item>
                 </template>
diff --git a/src/components/model-goods-tabs/model-goods-tabs-content.vue b/src/components/model-goods-tabs/model-goods-tabs-content.vue
index 06a7ca33..1f2e0b2f 100644
--- a/src/components/model-goods-tabs/model-goods-tabs-content.vue
+++ b/src/components/model-goods-tabs/model-goods-tabs-content.vue
@@ -15,18 +15,14 @@
                 <el-form-item label="选项卡置顶">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.tabs_top_up" active-value="1" inactive-value="0" />
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>滑动置顶仅手机端有效</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="1.滑动置顶仅手机端有效<br/>2.滑动置顶后通用的圆角不生效"></tooltip>
                     </div>
                 </el-form-item>
                 <template v-if="form.tabs_top_up == '1' && is_not_general_safe_distance">
                     <el-form-item label="安全距离">
                         <div class="flex-row align-c gap-10">
                             <el-switch v-model="form.is_general_safe_distance" active-value="1" inactive-value="0" />
-                            <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>选项卡置顶是否需要安全距离</span>" raw-content placement="top">
-                                <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                            </el-tooltip>
+                            <tooltip content="选项卡置顶是否需要安全距离"></tooltip>
                         </div>
                     </el-form-item>
                 </template>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 7165d16d..73beeaa9 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -29,22 +29,16 @@
                 </el-form-item>
                 <el-form-item label="滑动置顶">
                     <el-switch v-model="form.tabs_top_up" class="mr-10" active-value="1" inactive-value="0" />
-                    <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>滑动置顶仅手机端有效</span>" raw-content placement="top">
-                        <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                    </el-tooltip>
+                    <tooltip :content="`1.滑动置顶仅手机端有效${ !isCommon ? '<br/>2.滑动置顶后通用的圆角不生效' : ''}`"></tooltip>
                 </el-form-item>
                 <template v-if="!isCommon">
                     <el-form-item v-if="is_general_safe_distance" label="安全距离">
                         <el-switch v-model="form.is_tabs_safe_distance" class="mr-10" active-value="1" inactive-value="0" />
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>选项卡是否支持安全距离</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="选项卡是否支持安全距离"></tooltip>
                     </el-form-item>
                     <el-form-item label="轮播背景">
                         <el-switch v-model="form.rotating_background" class="mr-10" active-value="1" inactive-value="0" />
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>1.关闭的时候,如果没有选项卡背景会使用通用背景.<br/>2.打开的时候,如果没有选项卡背景会使用轮播背景,都没有的时候会使用通用背景.</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="1.关闭的时候,如果没有选项卡背景会使用通用背景.<br/>2.打开的时候,如果没有选项卡背景会使用轮播背景,都没有的时候会使用通用背景"></tooltip>
                     </el-form-item>
                 </template>
             </card-container>
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index 45c98f72..e251a5f3 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -31,17 +31,13 @@
                 <el-form-item v-if="form.header_background_type == 'transparent'" label="沉浸样式">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.immersive_style" active-value="1" inactive-value="0" @change="change_immersive_style"></el-switch>
-                        <!-- <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>开启沉浸样式时，不可添加选项卡和选项卡轮播。<br/>并且商品选项卡和文章选项卡的选项卡置顶功能禁用</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip> -->
+                        <!-- <tooltip content="1.开启沉浸样式时，不可添加选项卡和选项卡轮播。<br/>2.并且商品选项卡和文章选项卡的选项卡置顶功能禁用"></tooltip> -->
                     </div>
                 </el-form-item>
                 <el-form-item v-if="form.header_background_type == 'transparent' && form.immersive_style === '1'" label="安全距离">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.general_safe_distance_value" active-value="1" inactive-value="0" @change="general_safe_distance_value_change"></el-switch>
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>开启后第一个组件上内边距将增加顶部安全距离+导航高度</span>" raw-content placement="top">
-                            <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                        </el-tooltip>
+                        <tooltip content="开启后第一个组件上内边距将增加顶部安全距离+导航高度"></tooltip>
                     </div>
                 </el-form-item>
                 <el-form-item label="上滑展示">
@@ -57,9 +53,7 @@
                 </template>
                 <el-form-item label="返回颜色">
                     <color-picker v-model="form.left_back_btn_color" class="mr-10" default-color="#333"></color-picker>
-                    <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="打开新页面才会出现返回按钮" raw-content placement="top">
-                        <icon name="miaosha-hdgz" size="12" color="#999"></icon>
-                    </el-tooltip>
+                    <tooltip content="打开新页面才会出现返回按钮"></tooltip>
                 </el-form-item>
                 <el-form-item v-if="page_content.data_alone_row_value.length > 0" label="换行间距">
                     <slider v-model="form.data_alone_row_space" :max="100"></slider>

From 6cf1d9c7fb911e3816e4651b8e26e34a74986939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 11:29:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=B0=81=E8=A3=85=E6=88=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/tooltip/index.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/components/base/tooltip/index.vue

diff --git a/src/components/base/tooltip/index.vue b/src/components/base/tooltip/index.vue
new file mode 100644
index 00000000..eb3b9060
--- /dev/null
+++ b/src/components/base/tooltip/index.vue
@@ -0,0 +1,19 @@
+<template>
+    <el-tooltip effect="dark" :show-after="200" :hide-after="200" :content="props.content" :raw-content="props.rawContent" placement="top">
+        <icon name="miaosha-hdgz" size="12" color="#999"></icon>
+    </el-tooltip>
+</template>
+
+<script lang="ts" setup>
+interface TooltipProps {
+    content: string;
+    rawContent?: boolean;
+    placement?: 'top' | 'bottom' | 'left' | 'right';
+}
+
+const props = withDefaults(defineProps<TooltipProps>(), {
+    rawContent: true,
+    placement: 'top',
+});
+</script>
+