diff --git a/src/components/common/custom-module/model-custom-group/model-custom-group-style.vue b/src/components/common/custom-module/model-custom-group/model-custom-group-style.vue index 5a654380..5d3eb5ce 100644 --- a/src/components/common/custom-module/model-custom-group/model-custom-group-style.vue +++ b/src/components/common/custom-module/model-custom-group/model-custom-group-style.vue @@ -71,7 +71,7 @@ const custom_edit = () => { // 计算宽度 width = form.value.data_source_direction != 'vertical-scroll' ? com_width / form.value.data_source_carousel_col : com_width; // 可拖拽区域的宽度 } - emit('custom_edit', diy_data.value.id, custom_list, width, custom_height, data_source_field, form.value.is_use_parent_data); + emit('custom_edit', diy_data.value.id, custom_list, width, custom_height, data_source_field, props.configLoop !== '1' ? form.value.is_use_parent_data : '1'); }; //# endregion // 操作结束触发事件 diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue index dc9c8059..c2b0195e 100644 --- a/src/components/model-custom/model-custom-content.vue +++ b/src/components/model-custom/model-custom-content.vue @@ -168,7 +168,7 @@ const custom_edit = (type: string, id?: string, father_list?: any, list?: any, w custom_group_field_id.value = data_source_field?.id || ''; // 自定义组的数据源内容切换, 如果选择了自定义数据源,那么就获取到自定义数据源的内容,否则的话取当前整个自定义组的数据源 const is_data_source_id = model_data_source.value.filter((item: any) => item.field == data_source_field?.id); - if (form.value.configLoop == '1') { + if (form.value.data_source_is_loop == '1') { 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 || '');