diff --git a/src/components/ma-crud/components/searchFormItem/form-picker.vue b/src/components/ma-crud/components/searchFormItem/form-picker.vue index d460d0d1..fefa25cd 100644 --- a/src/components/ma-crud/components/searchFormItem/form-picker.vue +++ b/src/components/ma-crud/components/searchFormItem/form-picker.vue @@ -14,6 +14,7 @@ :placeholder="props.component.formType === 'range' ? ['请选择开始时间', '请选择结束时间'] : `请选择${props.component.title}`" :time-picker-props="props.component.formType == 'range' ? { defaultValue: ['00:00:00', '23:59:59'] } : {}" :show-time="props.component.showTime" + :type="props.component.range ? props.component.formType === 'time' ? 'time-range' : 'range' : ''" :format="props.component.format || ''" :mode="props.component.mode" allow-clear diff --git a/src/components/ma-form/formItem/form-picker.vue b/src/components/ma-form/formItem/form-picker.vue index 6cb44c2d..b3b61f45 100644 --- a/src/components/ma-form/formItem/form-picker.vue +++ b/src/components/ma-form/formItem/form-picker.vue @@ -39,7 +39,7 @@ :show-time="props.component.showTime" :preview-shortcut="props.component.previewShortcut" :show-confirm-btn="props.component.showConfirmBtn" - :type="props.component.range ? 'time-range' : ''" + :type="props.component.range ? props.component.formType === 'time' ? 'time-range' : 'range' : ''" :time-picker-props="props.component.formType == 'range' ? { defaultValue: ['00:00:00', '23:59:59'] } : {}" :separator="props.component.separator" :mode="props.component.mode"