diff --git a/components/diy/custom.vue b/components/diy/custom.vue index f527295b..2fd25ca7 100644 --- a/components/diy/custom.vue +++ b/components/diy/custom.vue @@ -1,50 +1,54 @@ - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + {{ actived_index + 1 }} + /{{ data_source_content_list.length }} + + + + + + + + + + + - - - - - - {{ actived_index + 1 }} - /{{ data_source_content_list.length }} - - - - - - - - - - - - + - + @@ -101,6 +105,9 @@ }, data_source_content_list: [], data_source: '', + // 内容样式 + style_content_container: '', + style_content_img_container: '', // 数据样式 style_chunk_container: '', style_chunk_img_container: '', @@ -187,6 +194,7 @@ // 自定义组件宽度 const width = sys_width - margin_left - margin_right - padding_left - padding_right - this.propOuterContainerPadding; const new_data_style = !isEmpty(new_style.data_style) ? new_style.data_style : this.old_data_style; + const new_data_content_style = !isEmpty(new_style.data_content_style)? new_style.data_content_style : this.old_data_style; // 判断是平移还是整屏滚动 const { padding_top = 0, padding_bottom = 0, margin_bottom = 0, margin_top = 0 } = new_data_style; let swiper_height = 0; @@ -214,6 +222,8 @@ custom_list_length: new_form.custom_list.length - 1, style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;', // 用于样式显示 style_img_container: common_img_computer(new_style.common_style, this.propIndex), + style_content_container: common_styles_computer(new_data_content_style) + 'box-sizing: border-box;', // 用于样式显示 + style_content_img_container: common_img_computer(new_data_content_style), style_chunk_container: common_styles_computer(new_data_style) + 'box-sizing: border-box;', // 用于样式显示 style_chunk_img_container: common_img_computer(new_data_style), style_chunk_width: width, diff --git a/components/diy/modules/data-magic/custom/index.vue b/components/diy/modules/data-magic/custom/index.vue index ed58a4f8..e5024d61 100644 --- a/components/diy/modules/data-magic/custom/index.vue +++ b/components/diy/modules/data-magic/custom/index.vue @@ -1,41 +1,45 @@ - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - -