diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue index 37eb34b2aa..3eb754c52e 100644 --- a/core/core-frontend/src/custom-component/v-query/Time.vue +++ b/core/core-frontend/src/custom-component/v-query/Time.vue @@ -49,7 +49,8 @@ const multiple = ref(false) const dvMainStore = dvMainStoreWithOut() const { config } = toRefs(props) - +const minDate = new Date('1970/1/1') +const maxDate = new Date('2100/1/1') watch( () => config.value.defaultValue, val => { @@ -280,7 +281,12 @@ const formatDate = computed(() => { :tabs="['选择日期', '选择时间']" next-step-text="下一步" > - + { :columns-type="columnsType" @confirm="onConfirm" @cancel="onCancel" + :min-date="minDate" + :max-date="maxDate" v-if="!showTimePick" v-model="currentDate" /> diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue index 1705913a12..1cdf290574 100644 --- a/core/core-frontend/src/layout/components/Header.vue +++ b/core/core-frontend/src/layout/components/Header.vue @@ -60,7 +60,13 @@ onMounted(() => {