diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue index 0d437cf7..ddb05b21 100644 --- a/src/components/model-custom/components/index.vue +++ b/src/components/model-custom/components/index.vue @@ -310,10 +310,10 @@ const resizingHandle = (new_location: any, key: string, index: number) => { }; // 图片大小的计算 const handleImg = (com_data: any, w: number, h: number ) => { - if (com_data.border_show) { + if (com_data.border_show == '1') { return { img_width: w - com_data.border_size * 2, img_height: h - com_data.border_size * 2 } } else { - return { img_width: w, img_height: h } + return { img_width: w, img_height: h } } }; // 线条的计算 @@ -658,6 +658,7 @@ defineExpose({ margin: 0 auto; .drag-area { height: v-bind(drag_area_height); + width: 100%; margin: 0.5rem 0; // 用于将上边框和下边框显示出来 user-select: none; cursor: crosshair; diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 9dae554a..7e90f183 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -195,6 +195,8 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_ const new_array_3 = ['coupon']; // 层级更深 const new_array_4 = ['data-magic']; + // 自定义数据 + const new_array_5 = ['custom']; clone_form.diy_data = clone_form.diy_data.map((item: any) => { if (new_array_1.includes(item.key)) { item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || ''; @@ -230,6 +232,8 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_ }; }); }); + } else if (new_array_5.includes(item.key)) { + item.com_data.content.data_source_content = {}; } return { ...item,