diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue index 583d70d5..63fb323f 100644 --- a/pages/form-input/components/form-input/form-input.vue +++ b/pages/form-input/components/form-input/form-input.vue @@ -28,6 +28,7 @@ @dataAddressChange="data_address_change" @openRegion="open_region" @helpIconEvent="help_icon_event" + @subformHelpIconEvent="subform_help_icon_event" @zIndexChange="z_index_change" /> @@ -271,6 +272,11 @@ export default { this.setData({ popup_help_content: val }); this.$refs.popup.open(); }, + // 子表单帮助图标点击事件 + subform_help_icon_event(e) { + this.setData({ popup_help_content: e }); + this.$refs.popup.open(); + }, // 打开地区选择器 open_region(e) { this.setData({ diff --git a/pages/form-input/components/form-input/modules/component-show/index.vue b/pages/form-input/components/form-input/modules/component-show/index.vue index 5796c2ee..f24e155c 100644 --- a/pages/form-input/components/form-input/modules/component-show/index.vue +++ b/pages/form-input/components/form-input/modules/component-show/index.vue @@ -2,7 +2,7 @@ - + {{ item.com_data.title }}* @@ -90,14 +90,17 @@ + + + - + - + {{ item.com_data.common_config.error_text }} @@ -131,6 +134,7 @@ import componentRichText from '@/pages/form-input/components/form-input/rich-tex import componentUpload from '@/pages/form-input/components/form-input/upload.vue'; import componentPosition from '@/pages/form-input/components/form-input/position.vue'; import componentRectOrRound from '@/pages/form-input/components/form-input/rect-or-round.vue'; +import componentSubform from '@/pages/form-input/components/form-input/subform.vue'; export default { name: 'formInput', components: { @@ -155,7 +159,8 @@ export default { componentRichText, componentUpload, componentPosition, - componentRectOrRound + componentRectOrRound, + componentSubform }, props: { propValue: { @@ -227,9 +232,12 @@ export default { z_index_id: '', }) }, - help_icon_event() { + help_icon_event(e) { this.$emit('helpIconEvent', e.currentTarget.dataset.value); }, + subform_help_icon_event(e) { + this.$emit('subformHelpIconEvent', e); + }, data_change(e) { this.$emit('dataChange', e); }, diff --git a/pages/form-input/components/form-input/subform.vue b/pages/form-input/components/form-input/subform.vue new file mode 100644 index 00000000..4ee65c8a --- /dev/null +++ b/pages/form-input/components/form-input/subform.vue @@ -0,0 +1,137 @@ + + + + +