diff --git a/pages/form-input/components/form-input/attachments.vue b/pages/form-input/components/form-input/attachments.vue index d60a7127..6facdf06 100644 --- a/pages/form-input/components/form-input/attachments.vue +++ b/pages/form-input/components/form-input/attachments.vue @@ -1,11 +1,28 @@ - + diff --git a/pages/form-input/components/form-input/auxiliary-line.vue b/pages/form-input/components/form-input/auxiliary-line.vue index d60a7127..438838ef 100644 --- a/pages/form-input/components/form-input/auxiliary-line.vue +++ b/pages/form-input/components/form-input/auxiliary-line.vue @@ -1,7 +1,6 @@ @@ -33,7 +32,8 @@ data() { return { com_data: {}, - form_value: '', + line_location: '', + border_style: '', }; }, watch: { @@ -50,9 +50,20 @@ // 初始化数据 init() { const com_data = this.propValue; + let border_style = ''; + if (!this.propIsCustom) { + border_style =`width: ${ com_data.line_width }%;border-bottom: ${ com_data.line_size }px ${ com_data.line_style } ${ com_data.line_color };`; + } else { + if (com_data.line_type === 'horizontal') { + border_style = `width: ${com_data.com_width * 2}rpx;margin: 10rpx 0;border-bottom: ${com_data.line_size * 2 }rpx ${com_data.line_style} ${com_data.line_color};`; + } else { + border_style = `height: ${com_data.com_height * 2}rpx;margin: 0 10rpx;border-right: ${com_data.line_size * 2 }rpx ${com_data.line_style} ${com_data.line_color};`; + } + } this.setData({ com_data: com_data, - form_value: com_data?.form_value || '', + border_style: border_style, + line_location: `justify-content: ${ com_data.line_location };` }); } }, diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue index 19edc1d8..aaec52a6 100644 --- a/pages/form-input/components/form-input/form-input.vue +++ b/pages/form-input/components/form-input/form-input.vue @@ -12,7 +12,7 @@ - + {{ item.com_data.title }}* @@ -67,6 +67,12 @@ + + + + + + {{ item.com_data.common_config.error_text }} @@ -112,6 +118,8 @@ import componentScore from '@/pages/form-input/components/form-input/score.vue'; import componentImage from '@/pages/form-input/components/form-input/image.vue'; import componentVideo from '@/pages/form-input/components/form-input/video.vue'; import componentText from '@/pages/form-input/components/form-input/text.vue'; +import componentAttachments from '@/pages/form-input/components/form-input/attachments.vue'; +import componentAuxiliaryLine from '@/pages/form-input/components/form-input/auxiliary-line.vue'; import componentRegionPicker from '@/pages/common/components/region-picker/region-picker'; export default { name: 'formInput', @@ -132,7 +140,9 @@ export default { componentScore, componentImage, componentVideo, - componentText + componentText, + componentAttachments, + componentAuxiliaryLine }, props: { propValue: {