From 639f26323941b17902e1669778b2857465a8038a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 22 九月 2025 15:18:34 +0800
Subject: [PATCH] Merge branch 'dev-v1.1'
---
packages/components/src/Input/ChooseInputWithDatePicker.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/packages/components/src/Input/ChooseInputWithDatePicker.vue b/packages/components/src/Input/ChooseInputWithDatePicker.vue
index a40694d..2f55286 100644
--- a/packages/components/src/Input/ChooseInputWithDatePicker.vue
+++ b/packages/components/src/Input/ChooseInputWithDatePicker.vue
@@ -15,16 +15,22 @@
type Props = {
modelValue: string | number;
+ minDate?: Date;
+ maxDate?: Date;
+ type?: string;
+ format?: string;
};
-const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {
+ format: 'YYYY-MM-DD',
+});
const emit = defineEmits<{
(e: 'update:modelValue', val: string | number): void;
}>();
function handleOpen() {
- const _modelValue = [props.modelValue];
+ const _modelValue = dayjs(props.modelValue).toDate();
Portal.add((key) => {
return h(
Portal.Container,
@@ -43,11 +49,13 @@
h(DatePicker, {
modelValue: _modelValue,
onCancel: onClose,
+ type: props.type,
+ maxDate: props.maxDate,
onConfirm: ({ selectedValue }) => {
- console.log('selectedValue: ', selectedValue);
- emit('update:modelValue', dayjs(selectedValue).format('YYYY-MM-DD'));
+ emit('update:modelValue', dayjs(selectedValue.join('-')).format(props.format));
onClose();
},
+ minDate: props.minDate,
}),
}
),
--
Gitblit v1.9.1