From db2456db86ff7950437f19f315df52d900706c7b Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 5 Mar 2024 16:33:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=97=A5=E6=9C=9F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E8=8C=83=E5=9B=B4=E5=A4=AA=E5=B0=8F=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E9=80=89=E5=89=8D=E5=90=8E=2010=20=E5=B9=B4=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/v-query/Time.vue | 12 ++++++++++-- core/core-frontend/src/layout/components/Header.vue | 8 +++++++- 2 files changed, 17 insertions(+), 3 deletions(-) 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(() => {