From 82317d6b3e5c0f34d87d438791fe0bd48ed15417 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, 13 Jan 2025 14:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=BB=84=E5=86=85=E5=AE=B9=E7=9A=84=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/carousel-indicator/index.vue       |  2 +-
 .../custom-module/data-rendering/index.vue    | 10 +++-
 .../model-custom-group/index.vue              | 46 ++++++++++++++-----
 .../common/custom-module/model-icon/index.vue |  4 ++
 .../custom-module/model-image/index.vue       |  4 ++
 .../custom-module/model-lines/index.vue       |  4 ++
 .../custom-module/model-panel/index.vue       |  4 ++
 .../common/custom-module/model-text/index.vue |  6 ++-
 .../model-carousel/model-carousel-content.vue | 10 +++-
 .../components/custom-config/index.vue        | 25 ++++++++--
 .../model-custom/components/index.vue         | 14 +++---
 src/components/model-custom/index.vue         |  4 +-
 .../model-custom/model-custom-content.vue     | 15 ++++--
 .../components/custom/index.vue               |  4 +-
 .../model-tabs-carousel-content.vue           |  7 ++-
 .../model-tabs/model-tabs-content.vue         | 10 +++-
 src/utils/index.ts                            |  2 +-
 17 files changed, 130 insertions(+), 41 deletions(-)

diff --git a/src/components/common/carousel-indicator/index.vue b/src/components/common/carousel-indicator/index.vue
index 023fe003..7db034e3 100644
--- a/src/components/common/carousel-indicator/index.vue
+++ b/src/components/common/carousel-indicator/index.vue
@@ -3,7 +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">
+            <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>
         </div>
diff --git a/src/components/common/custom-module/data-rendering/index.vue b/src/components/common/custom-module/data-rendering/index.vue
index 46b5c0d7..46f69c0e 100644
--- a/src/components/common/custom-module/data-rendering/index.vue
+++ b/src/components/common/custom-module/data-rendering/index.vue
@@ -2,7 +2,7 @@
     <div class="w h re custom-other">
         <div v-for="(item, index) in list" :key="item.id" class="main-content flex-row" :style="{'left': percentage_count(item.location.x) , 'top': percentage_count(item.location.y), 'width': percentage_count(item.com_data.com_width), 'height': percentage_count(item.com_data.com_height), 'z-index': (customList.length - 1) - index}">
             <template v-if="item.key == 'text'">
-                <model-text :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList"  :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :is-custom-group="isCustomGroup" :title-params="showData?.data_name || 'name'" :is-display-panel="true"></model-text>
+                <model-text :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :is-custom-group="isCustomGroup" :title-params="showData?.data_name || 'name'" :is-display-panel="true"></model-text>
             </template>
             <template v-else-if="item.key == 'img'">
                 <model-image :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :is-custom-group="isCustomGroup" :img-params="showData?.data_logo || ''" :is-display-panel="true"></model-image>
@@ -17,7 +17,7 @@
                 <model-panel :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :is-custom-group="isCustomGroup" :is-display-panel="true"></model-panel>
             </template>
             <template v-else-if="item.key == 'custom-group'">
-                <model-custom-group :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :data-height="item.com_data.custom_height" :data-width="item.com_data.com_width" :is-custom="isCustom" :is-display-panel="true"></model-custom-group>
+                <model-custom-group :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :group-source-list="groupSourceList" :show-data="showData" :data-height="item.com_data.custom_height" :data-width="item.com_data.com_width" :is-custom="isCustom" :is-display-panel="true"></model-custom-group>
             </template>
         </div>
     </div>
@@ -66,6 +66,12 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    groupSourceList: {
+        type: Array,
+        default: () => {
+            return [];
+        }
+    },
     customGroupFieldId: {
         type: String,
         default: ''
diff --git a/src/components/common/custom-module/model-custom-group/index.vue b/src/components/common/custom-module/model-custom-group/index.vue
index 6fd64d0b..c1ec2921 100644
--- a/src/components/common/custom-module/model-custom-group/index.vue
+++ b/src/components/common/custom-module/model-custom-group/index.vue
@@ -8,7 +8,7 @@
                             <div v-for="(item1, index1) in data_source_content_list" :key="index1" :style="`width: ${ gap_width }`">
                                 <div :style="style_chunk_container">
                                     <div class="w h oh" :style="style_chunk_img_container">
-                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="dataHeight" :scale="custom_scale" :custom-group-field-id="form?.data_source_field?.id || ''"></data-rendering>
+                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="dataHeight" :scale="custom_scale" :custom-group-field-id="form?.data_source_field?.id || ''" :is-custom-group="true" :is-custom="isCustom" :show-data="showData"></data-rendering>
                                     </div>
                                 </div>
                             </div>
@@ -19,7 +19,7 @@
                             <swiper-slide v-for="(item1, index1) in data_source_content_list" :key="index1">
                                 <div :style="style_chunk_container">
                                     <div class="w h oh" :style="style_chunk_img_container">
-                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="dataHeight" :scale="custom_scale" :custom-group-field-id="form?.data_source_field?.id || ''"></data-rendering>
+                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="dataHeight" :scale="custom_scale" :custom-group-field-id="form?.data_source_field?.id || ''" :is-custom-group="true" :is-custom="isCustom" :show-data="showData"></data-rendering>
                                     </div>
                                 </div>
                             </swiper-slide>
@@ -38,7 +38,7 @@
                     <template v-else>
                         <div :style="style_chunk_container">
                             <div class="w h oh" :style="style_chunk_img_container">
-                                <data-rendering :custom-list="form.custom_list" :data-height="form.height" :scale="custom_scale"></data-rendering>
+                                <data-rendering :custom-list="form.custom_list" :data-height="form.height" :scale="custom_scale" :is-custom-group="true" :is-custom="isCustom"></data-rendering>
                             </div>
                         </div>
                     </template>
@@ -87,6 +87,23 @@ const props = defineProps({
     isCustom: {
         type: Boolean,
         default: false
+    },
+    groupSourceList: {
+        type: Array,
+        default: () => {
+            return [];
+        }
+    },
+    showData: {
+        type: Object as PropType<{
+            data_key: string;
+            data_name: string;
+            data_logo?: string;
+        }>,
+        default: () => ({
+            data_key: 'id',
+            data_name: 'name',
+        })
     }
 });
 // 用于页面判断显示
@@ -102,19 +119,24 @@ const is_show = computed(() => {
 
 //#region 自定义组真实数据
 const data_source_content_list = computed(() => {
-    if (!isEmpty(props.sourceList)) {
-        const data_source_id = form.value.data_source_field.id;
-        let list = get_nested_property(props.sourceList, data_source_id);
-        // 如果是自定义标题，进一步处理嵌套对象中的数据
-        if (props.sourceList.data) {
-            list = get_nested_property(props.sourceList.data, data_source_id);
+    const data_source_id = form.value?.data_source_field?.id || '';
+    // 自定义组的数据源内容切换
+    const is_data_source_id = field_list.value.filter((item: any) => item.field == data_source_id);
+    if (is_data_source_id.length > 0) {
+        if (!isEmpty(props.sourceList)) {
+            let list = get_nested_property(props.sourceList, data_source_id);
+            // 如果是自定义标题，进一步处理嵌套对象中的数据
+            if (props.sourceList.data) {
+                list = get_nested_property(props.sourceList.data, data_source_id);
+            }
+            return list == '' ? [] : list;
+        } else {
+            return [];
         }
-        return list == '' ? [] : list;
     } else {
-        return [];
+        return props.groupSourceList;
     }
 });
-
 const get_nested_property = (obj: any, path: string) => {
     // 检查路径参数是否为字符串且非空，若不满足条件则返回空字符串
     if (typeof path !== 'string' || !path) return [];
diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue
index 87785781..1a9b9ffd 100644
--- a/src/components/common/custom-module/model-icon/index.vue
+++ b/src/components/common/custom-module/model-icon/index.vue
@@ -37,6 +37,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    isCustomGroup: {
+        type: Boolean,
+        default: false
+    },
     customGroupFieldId: {
         type: String,
         default: ''
diff --git a/src/components/common/custom-module/model-image/index.vue b/src/components/common/custom-module/model-image/index.vue
index 62a35308..1e8bb07c 100644
--- a/src/components/common/custom-module/model-image/index.vue
+++ b/src/components/common/custom-module/model-image/index.vue
@@ -32,6 +32,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    isCustomGroup: {
+        type: Boolean,
+        default: false
+    },
     customGroupFieldId: {
         type: String,
         default: ''
diff --git a/src/components/common/custom-module/model-lines/index.vue b/src/components/common/custom-module/model-lines/index.vue
index ba33120b..20b01dfd 100644
--- a/src/components/common/custom-module/model-lines/index.vue
+++ b/src/components/common/custom-module/model-lines/index.vue
@@ -26,6 +26,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    isCustomGroup: {
+        type: Boolean,
+        default: false
+    },
     customGroupFieldId: {
         type: String,
         default: ''
diff --git a/src/components/common/custom-module/model-panel/index.vue b/src/components/common/custom-module/model-panel/index.vue
index 35b89ffe..cd1fb763 100644
--- a/src/components/common/custom-module/model-panel/index.vue
+++ b/src/components/common/custom-module/model-panel/index.vue
@@ -28,6 +28,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    isCustomGroup: {
+        type: Boolean,
+        default: false
+    },
     customGroupFieldId: {
         type: String,
         default: ''
diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue
index 3ec3ef79..fc5daf1b 100644
--- a/src/components/common/custom-module/model-text/index.vue
+++ b/src/components/common/custom-module/model-text/index.vue
@@ -39,6 +39,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    isCustomGroup: {
+        type: Boolean,
+        default: false
+    },
     customGroupFieldId: {
         type: String,
         default: ''
@@ -87,7 +91,7 @@ const text_title = computed(() => {
         let new_title = cloneDeep(formValue.text_title);
         let new_field_list = field_list.value;
         // 判断是否是自定义组
-        if (!props.isCustom && !isEmpty(props.customGroupFieldId)) {
+        if (props.isCustomGroup && !isEmpty(props.customGroupFieldId)) {
             // 取出对应自定义组的内容
             const group_option_list = new_field_list.find((item: any) => item.field === props.customGroupFieldId);
             // 取出自定义组内部数据源参数的详细数据
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 97dd1948..8d5ce844 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="auxiliary-line common-content-height">
         <el-form :model="form" label-width="60">
-            <common-content-top :value="form.content_top"></common-content-top>
-            <div class="divider-line"></div>
+            <template v-if="isCommon">
+                <common-content-top :value="form.content_top"></common-content-top>
+                <div class="divider-line"></div>
+            </template>
             <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="样式设置">
@@ -82,6 +84,10 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    isCommon: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const state = reactive({
diff --git a/src/components/model-custom/components/custom-config/index.vue b/src/components/model-custom/components/custom-config/index.vue
index 5cd09a43..64628d36 100644
--- a/src/components/model-custom/components/custom-config/index.vue
+++ b/src/components/model-custom/components/custom-config/index.vue
@@ -2,7 +2,7 @@
     <Dialog v-model:visible="dialogVisible" :title="configType == 'custom' ? '编辑自定义' : '编辑自定义组'" @accomplish="accomplish" @close_event="close_event">
         <div class="flex-row h w">
             <!-- 左侧和中间区域 -->
-            <DragIndex ref="draglist" :key="dragkey" v-model:height="center_height" v-model:width="center_width" :config-type="configType" :source-list="sourceList" :custom-group-field-id="customGroupFieldId" :is-custom="configType == 'custom'? isCustom : false" :show-data="showData" :list="new_list" @right-update="right_update" @operation_end="operation_end"></DragIndex>
+            <DragIndex ref="draglist" :key="dragkey" v-model:height="center_height" v-model:width="center_width" :config-type="configType" :source-list="sourceList" :group-source-list="groupSourceList" :custom-group-field-id="customGroupFieldId" :is-custom-group="isCustomGroup" :is-custom="isCustom" :show-data="showData" :list="new_list" @right-update="right_update" @operation_end="operation_end"></DragIndex>
             <!-- 右侧配置区域 -->
             <div class="settings">
                 <template v-if="diy_data.key === 'img'">
@@ -41,6 +41,7 @@ import { cloneDeep, isEqual } from "lodash";
 const data_source_store = DataSourceStore();
 
 const props = defineProps({
+    // 配置类型，custom：自定义，custom-group：自定义组
     configType: {
         type: String,
         default: 'custom',
@@ -49,30 +50,49 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    // 数据源配置项
     options: {
         type: Array<any>,
         default: () => [],
     },
+    // 真实数据，独立的数据信息
     sourceList: {
         type: Object,
         default: () => {},
     },
+    // 自定义组使用的真实数据，包含整个外层真实数据，如果自定义组不使用内部数据源的时候，那么就是父级的数据源
+    groupSourceList: {
+        type: Array,
+        default: () => {
+            return [];
+        }
+    },
+    // 判断是否是自定义
     isCustom: {
         type: Boolean,
         default: false,
     },
+    // 判断是否是自定义组
+    isCustomGroup: {
+        type: Boolean,
+        default: false,
+    },
+    // 手动模式下的显示数据
     showData: {
         type: Object,
         default: () => ({ data_key: 'id', data_name: 'name' }),
     },
+    // 自定义组的id
     customId: {
         type: String,
         default: '',
     },
+    // 自定义数据源id
     customGroupFieldId: {
         type: String,
         default: '',
     },
+    // 自定义内容的渲染处理，自定义组传递的是内部的自定义内容
     customList: {
         type: Array<any>,
         default: () => [],
@@ -188,9 +208,6 @@ const operation_end = (is_compare: boolean = true) => {
         }
         // 新的数据
         const new_compare_data = cloneDeep(draglist.value.diy_data);
-        console.log(old_compare_data);
-        console.log(new_compare_data);
-        console.log(!isEqual(old_compare_data, new_compare_data));
         if (!is_compare || !isEqual(old_compare_data, new_compare_data)) {
             // 如果是自定点击完成，需要将数据传递给父组件
             if (props.configType == 'custom') {
diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index 51a08e02..11560c2d 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -71,22 +71,22 @@
                                 <Vue3DraggableResizable v-for="(item, index) in diy_data" :key="item.id" v-model:w="item.com_data.com_width" v-model:h="item.com_data.com_height" :min-w="0" :min-h="0" :class="{'plug-in-show-component-line': is_show_component_line, 'plug-in-show-tabs': item.show_tabs == '1', 'vdr-handle-z-index': item.com_data.bottom_up == '1' }" :style="{ 'z-index': (diy_data.length - 1) - index }" :init-w="item.com_data.com_width" :init-h="item.com_data.com_height" :x="item.location.x" :y="item.location.y" :parent="true" :draggable="is_draggable" @mousedown.stop="on_choose(index, item.show_tabs)" @click.stop="on_choose(index, item.show_tabs)" @drag-end="dragEndHandle($event, index)" @resizing="resizingHandle($event, item.key, index, 'resizing')" @resize-end="resizingHandle($event, item.key, index, 'resizeEnd')">
                                     <div :class="['main-content flex-row', { 'plug-in-border': item.show_tabs == '1' }]">
                                         <template v-if="item.key == 'text'">
-                                            <model-text :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :title-params="showData?.data_name || 'name'"></model-text>
+                                            <model-text :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :is-custom-group="isCustomGroup" :custom-group-field-id="customGroupFieldId" :title-params="showData?.data_name || 'name'"></model-text>
                                         </template>
                                         <template v-else-if="item.key == 'img'">
-                                            <model-image :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId" :img-params="showData?.data_logo || ''"></model-image>
+                                            <model-image :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :is-custom-group="isCustomGroup" :custom-group-field-id="customGroupFieldId" :img-params="showData?.data_logo || ''"></model-image>
                                         </template>
                                         <template v-else-if="item.key == 'auxiliary-line'">
-                                            <model-lines :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId"></model-lines>
+                                            <model-lines :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :is-custom-group="isCustomGroup" :custom-group-field-id="customGroupFieldId"></model-lines>
                                         </template>
                                         <template v-else-if="item.key == 'icon'">
-                                            <model-icon :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId"></model-icon>
+                                            <model-icon :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :is-custom-group="isCustomGroup" :custom-group-field-id="customGroupFieldId"></model-icon>
                                         </template>
                                         <template v-else-if="item.key == 'panel'">
-                                            <model-panel :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :custom-group-field-id="customGroupFieldId"></model-panel>
+                                            <model-panel :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :is-custom-group="isCustomGroup" :custom-group-field-id="customGroupFieldId"></model-panel>
                                         </template>
                                         <template v-else-if="item.key == 'custom-group'">
-                                            <model-custom-group :key="item.id" :value="item.com_data" :source-list="props.sourceList" :data-height="item.com_data.custom_height" :data-width="item.com_data.com_width" :is-custom="isCustom"></model-custom-group>
+                                            <model-custom-group :key="item.id" :value="item.com_data" :source-list="props.sourceList" :group-source-list="groupSourceList" :data-height="item.com_data.custom_height" :data-width="item.com_data.com_width" :is-custom="isCustom" :show-data="showData"></model-custom-group>
                                         </template>
                                     </div>
                                 </Vue3DraggableResizable>
@@ -128,6 +128,8 @@ interface Props {
     isCustom: boolean;
     showData: any;
     customGroupFieldId: string;
+    isCustomGroup: boolean;
+    groupSourceList: Array<any>;
 }
 const props = defineProps<Props>();
 //#endregion
diff --git a/src/components/model-custom/index.vue b/src/components/model-custom/index.vue
index 419951bd..4290fadb 100644
--- a/src/components/model-custom/index.vue
+++ b/src/components/model-custom/index.vue
@@ -8,7 +8,7 @@
                             <div v-for="(item1, index1) in data_source_content_list" :key="index1" :style="`width: ${ gap_width }`">
                                 <div :style="style_chunk_container">
                                     <div class="w h oh" :style="style_chunk_img_container">
-                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="form.height" :scale="scale" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"></data-rendering>
+                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :group-source-list="data_source_content_list" :data-height="form.height" :scale="scale" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"></data-rendering>
                                     </div>
                                 </div>
                             </div>
@@ -19,7 +19,7 @@
                             <swiper-slide v-for="(item1, index1) in data_source_content_list" :key="index1">
                                 <div :style="style_chunk_container">
                                     <div class="w h oh" :style="style_chunk_img_container">
-                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :data-height="form.height" :scale="scale" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"></data-rendering>
+                                        <data-rendering :custom-list="form.custom_list" :source-list="item1" :group-source-list="data_source_content_list" :data-height="form.height" :scale="scale" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"></data-rendering>
                                     </div>
                                 </div>
                             </swiper-slide>
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 45f60240..db55e5ec 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -59,9 +59,9 @@
             <el-button class="w custom-button size-14" size="large" @click="custom_edit('custom')"><icon name="edit" size="14"></icon>自定义编辑</el-button>
         </el-form>
         <!-- 自定义内容处理 -->
-        <custom-config :key="dragkey + 'custom'" v-model:visible="dialogVisible" v-model:width="custom_width" v-model:height="center_height" :dragkey="dragkey + 'custom'" :options="model_data_source" :source-list="!isEmpty(data_source_content_list) ? data_source_content_list[0] : {}" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :custom-list="custom_list" @accomplish="accomplish" @custom_edit="custom_edit"></custom-config>
+        <custom-config :key="dragkey + 'custom'" v-model:visible="dialogVisible" v-model:width="custom_width" v-model:height="center_height" :dragkey="dragkey + 'custom'" :options="model_data_source" :source-list="!isEmpty(data_source_content_list) ? data_source_content_list[0] : {}" :group-source-list="data_source_content_list" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :custom-list="custom_list" @accomplish="accomplish" @custom_edit="custom_edit"></custom-config>
         <!-- 自定义内部数据内容处理 -->
-        <custom-config :key="drag_group_key + 'custom-group'" v-model:visible="dialogVisible_group" v-model:width="center_group_width" v-model:height="center_group_height" v-model:father-list="custom_group_father_list" config-type="custom-group" :dragkey="drag_group_key + 'custom-group'" :options="custom_group_option_list" :source-list="!isEmpty(new_group_source_list) ? new_group_source_list : {}" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :custom-id="center_group_id" :custom-list="custom_group_list" :custom-group-field-id="custom_group_field_id" @accomplish="accomplish"></custom-config>
+        <custom-config :key="drag_group_key + 'custom-group'" v-model:visible="dialogVisible_group" v-model:width="center_group_width" v-model:height="center_group_height" v-model:father-list="custom_group_father_list" config-type="custom-group" :dragkey="drag_group_key + 'custom-group'" :options="custom_group_option_list" :source-list="!isEmpty(new_group_source_list) ? new_group_source_list : {}" :group-source-list="data_source_content_list" :is-custom="form.is_custom_data == '1'" :is-custom-group="true" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :custom-id="center_group_id" :custom-list="custom_group_list" :custom-group-field-id="custom_group_field_id" @accomplish="accomplish"></custom-config>
         <!-- 手动筛选数据弹出框 -->
         <custom-dialog v-model:dialog-visible="url_value_dialog_visible" :data-list-key="form.show_data?.data_key || 'id'" :config="default_type_data.appoint_config" :extra-search-data="form.data_source_content" :multiple="url_value_multiple_bool" @confirm_event="url_value_dialog_call_back"></custom-dialog>
     </div>
@@ -153,8 +153,15 @@ const custom_edit = (type: string, id?: string, father_list?: any, list?: any, w
         center_group_height.value = height || 0;
         // 获取到真实数据和选项值
         custom_group_field_id.value = data_source_field?.id || '';
-        new_group_source_list.value = new_group_source_list_handle(data_source_field?.id || '');
-        custom_group_option_list.value = data_source_field?.option || [];
+        // 自定义组的数据源内容切换, 如果选择了自定义数据源，那么就获取到自定义数据源的内容，否则的话取当前整个自定义组的数据源
+        const is_data_source_id = model_data_source.value.filter((item: any) => item.field == data_source_field?.id);
+        if (is_data_source_id.length > 0) {
+            custom_group_option_list.value = data_source_field?.option || [];
+            new_group_source_list.value = new_group_source_list_handle(data_source_field?.id || '');
+        } else {
+            custom_group_option_list.value = model_data_source.value;
+            new_group_source_list.value = !isEmpty(data_source_content_list) ? data_source_content_list.value[0] : {};
+        }
         // 设置是否是子页面
         data_source_store.set_is_children_custom(true);
     }
diff --git a/src/components/model-data-magic/components/custom/index.vue b/src/components/model-data-magic/components/custom/index.vue
index c2f019c2..9bb16836 100644
--- a/src/components/model-data-magic/components/custom/index.vue
+++ b/src/components/model-data-magic/components/custom/index.vue
@@ -6,7 +6,7 @@
                     <div v-for="(item1, index1) in data_source_content_list" :key="index1" :style="`width: ${ gap_width }`">
                         <div :style="style_container">
                             <div class="w h oh" :style="style_img_container">
-                                <data-rendering :custom-list="form.custom_list" :source-list="item1" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :data-height="form.height" :scale="scale"></data-rendering>
+                                <data-rendering :custom-list="form.custom_list" :source-list="item1" :group-source-list="data_source_content_list" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :data-height="form.height" :scale="scale"></data-rendering>
                             </div>
                         </div>
                     </div>
@@ -17,7 +17,7 @@
                     <swiper-slide v-for="(item1, index1) in data_source_content_list" :key="index1">
                         <div :style="style_container">
                             <div class="w h oh" :style="style_img_container">
-                                <data-rendering :custom-list="form.custom_list" :source-list="item1" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :data-height="form.height" :scale="scale"></data-rendering>
+                                <data-rendering :custom-list="form.custom_list" :source-list="item1" :group-source-list="data_source_content_list" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }" :data-height="form.height" :scale="scale"></data-rendering>
                             </div>
                         </div>
                     </swiper-slide>
diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-content.vue b/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
index 186b9f73..da4750b6 100644
--- a/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
+++ b/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
@@ -2,10 +2,13 @@
     <div class="common-content-height">
         <el-tabs v-model="tabs_name" class="content-tabs" @tab-change="change_tab_event">
             <el-tab-pane label="选项卡" name="tabs">
-                <model-tabs-content :value="form" :tab-style="styles"></model-tabs-content>
+                <model-tabs-content :value="form" :tab-style="styles" :is-common="false"></model-tabs-content>
             </el-tab-pane>
             <el-tab-pane label="轮播" name="carousel">
-                <model-carousel-content :value="form"></model-carousel-content>
+                <model-carousel-content :value="form" :is-common="false"></model-carousel-content>
+            </el-tab-pane>
+            <el-tab-pane label="公共" name="common">
+                <common-content-top :value="form.content_top"></common-content-top>
             </el-tab-pane>
         </el-tabs>
     </div>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 73c85744..6679778f 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="common-content-height">
         <el-form :model="form" label-width="60">
-            <common-content-top :value="form.content_top"></common-content-top>
-            <div class="divider-line"></div>
+            <template v-if="isCommon">
+                <common-content-top :value="form.content_top"></common-content-top>
+                <div class="divider-line"></div>
+            </template>
             <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选择风格">
@@ -95,6 +97,10 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    isCommon: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const state = reactive({
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 7115e38d..217bcfef 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -317,7 +317,7 @@ export const get_is_eligible = (field_list: any[], condition: condition_data, pr
         let option: any = {};
         if (field_list) {
             // 判断是否是自定义组并且 自定义组选则了对应的数据源
-            if (!props.isCustom && !isEmpty(props.customGroupFieldId)) {
+            if (props.isCustomGroup && !isEmpty(props.customGroupFieldId)) {
                 // 取出对应自定义组的内容
                 const group_option_list = field_list.find((item: any) => item.field === props.customGroupFieldId);
                 // 取出自定义组内部数据源参数的详细数据