From e9e4d4d90b1a3cb452fcbf0b8c35735b4bcf557d Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Fri, 20 Jun 2025 16:00:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BF=94=E5=9B=9E=E6=95=B0=E7=BB=84=E6=88=96=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RangePicker/src/RangePicker.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/RangePicker/src/RangePicker.vue b/src/components/RangePicker/src/RangePicker.vue index 951c84f..9d29c0f 100644 --- a/src/components/RangePicker/src/RangePicker.vue +++ b/src/components/RangePicker/src/RangePicker.vue @@ -26,6 +26,10 @@ mainKey: String, //组件在子表中的Index tableIndex: Number, + valueType: { + default: 'Array', + type: String + } }); const formModel = inject('formModel', null); @@ -34,7 +38,7 @@ watch( () => props.value, (val: any) => { - modelValue.value = val || []; + modelValue.value = props.valueType == 'Array' ? val : val.split(','); }, { immediate: true, @@ -56,20 +60,20 @@ formModel[props.mainKey][props.tableIndex!]?.[props.startField!], formModel[props.mainKey][props.tableIndex!]?.[props.endField!], ]; - emit('update:value', emitData); + emit('update:value', props.valueType == 'Array' || !emitData ? emitData : emitData.join(',')); } else { if (props.startField && props.endField && Object.keys(formModel).length) { const emitData = !formModel[props.startField] || !formModel[props.endField] ? null : [formModel[props.startField], formModel[props.endField]]; - emit('update:value', emitData); + emit('update:value', props.valueType == 'Array' || !emitData ? emitData : emitData.join(',')); } } }); const handleChange = (time) => { - emit('update:value', time); - emit('change', time); + emit('update:value', props.valueType == 'Array' || !time ? time : time.join(',')); + emit('change', props.valueType == 'Array' || !time ? time : time.join(',')); if (formModel && props.startField && props.endField) { if (props.mainKey) { formModel[props.mainKey][props.tableIndex!][props.startField!] = time?.length