From b8f097cbce7863f638b1a9dc16bb0448fb00a216 Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Thu, 24 Oct 2024 02:32:48 -0700 Subject: [PATCH 1/4] feat(date-picker): [date-picker]Optimize case display and fix style issues --- .../demos/pc/app/date-picker/align-composition-api.vue | 2 +- examples/sites/demos/pc/app/date-picker/align.vue | 2 +- .../pc/app/date-picker/date-range-composition-api.vue | 1 + examples/sites/demos/pc/app/date-picker/date-range.vue | 1 + .../demos/pc/app/date-picker/events-composition-api.vue | 2 +- examples/sites/demos/pc/app/date-picker/events.vue | 2 +- .../sites/demos/pc/app/date-picker/now-composition-api.vue | 7 +++++-- examples/sites/demos/pc/app/date-picker/now.vue | 7 +++++-- .../demos/pc/app/date-picker/timezone-composition-api.vue | 6 ++++++ packages/theme/src/date-table/index.less | 4 +++- 10 files changed, 25 insertions(+), 9 deletions(-) diff --git a/examples/sites/demos/pc/app/date-picker/align-composition-api.vue b/examples/sites/demos/pc/app/date-picker/align-composition-api.vue index 391a97e588..76b3ee515e 100644 --- a/examples/sites/demos/pc/app/date-picker/align-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/align-composition-api.vue @@ -31,6 +31,6 @@ const value = ref('') diff --git a/examples/sites/demos/pc/app/date-picker/align.vue b/examples/sites/demos/pc/app/date-picker/align.vue index c7d0095ed0..b031f52c2d 100644 --- a/examples/sites/demos/pc/app/date-picker/align.vue +++ b/examples/sites/demos/pc/app/date-picker/align.vue @@ -39,6 +39,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/date-range-composition-api.vue b/examples/sites/demos/pc/app/date-picker/date-range-composition-api.vue index 17f2dcbf86..d3fe5b7fe4 100644 --- a/examples/sites/demos/pc/app/date-picker/date-range-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/date-range-composition-api.vue @@ -39,6 +39,7 @@ const yearValue = ref('') diff --git a/packages/theme/src/date-table/index.less b/packages/theme/src/date-table/index.less index 73163b53ec..7d28832a7b 100644 --- a/packages/theme/src/date-table/index.less +++ b/packages/theme/src/date-table/index.less @@ -228,7 +228,6 @@ div { margin-left: 4px; margin-right: 4px; - background-color: var(--tv-DateTable-td-bg-color-range-selected); } span { @@ -242,6 +241,9 @@ background-color: var(--tv-DateTable-bg-color-current-select); } } + &.selected.in-range { + background-color: var(--tv-DateTable-td-bg-color-range-selected); + } &.week { font-size: 80%; From f78f240a43d98435a3efc0f1f9fd0b065505079e Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Thu, 24 Oct 2024 02:47:08 -0700 Subject: [PATCH 2/4] feat(date-picker): [date-picker]Optimize case display and fix style issues --- packages/theme/src/date-table/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/theme/src/date-table/index.less b/packages/theme/src/date-table/index.less index 7d28832a7b..d5e4ac1f3e 100644 --- a/packages/theme/src/date-table/index.less +++ b/packages/theme/src/date-table/index.less @@ -241,7 +241,7 @@ background-color: var(--tv-DateTable-bg-color-current-select); } } - &.selected.in-range { + &.selected.in-range div{ background-color: var(--tv-DateTable-td-bg-color-range-selected); } From b8b608e9b95130d64739ef10d20884f5ec27c775 Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Thu, 24 Oct 2024 20:23:11 -0700 Subject: [PATCH 3/4] feat(date-picker): [date-picker] Fix style issues --- packages/theme/src/month-table/index.less | 3 ++- packages/theme/src/month-table/vars.less | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/theme/src/month-table/index.less b/packages/theme/src/month-table/index.less index e5ac40a79b..4f14427016 100644 --- a/packages/theme/src/month-table/index.less +++ b/packages/theme/src/month-table/index.less @@ -64,10 +64,11 @@ .cell { background-color: var(--tv-MonthTable-bg-color-disabled); cursor: not-allowed; - color: var(--tv-MonthTable-bg-color-disabled); + color: var(--tv-MonthTable-cell-color-disabled); &:hover { cursor: not-allowed; + background-color: var(--tv-MonthTable-bg-color-disabled); } } } diff --git a/packages/theme/src/month-table/vars.less b/packages/theme/src/month-table/vars.less index 8c8438d1a2..dfd0d339ae 100644 --- a/packages/theme/src/month-table/vars.less +++ b/packages/theme/src/month-table/vars.less @@ -42,6 +42,8 @@ // 背景色（禁用） --tv-MonthTable-bg-color-disabled: var(--tv-color-bg-disabled, #f0f0f0); + // 文字色（禁用） + --tv-MonthTable-cell-color-disabled: var(--tv-color-text-disabled, #c2c2c2); // 背景色（悬浮） --tv-MonthTable-bg-color-hover: var(--tv-color-bg-hover-1, #deecff); // 背景色(高亮） 开始/结束如期高亮 From 14ff6f6d333d8f5123ae671efb7c003f69772cc9 Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Fri, 25 Oct 2024 03:00:00 -0700 Subject: [PATCH 4/4] feat(date-picker): [date-picker] Modify console for a large number of alarms --- packages/renderless/src/date-panel/vue.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/renderless/src/date-panel/vue.ts b/packages/renderless/src/date-panel/vue.ts index fc0340f72c..8ef37833af 100644 --- a/packages/renderless/src/date-panel/vue.ts +++ b/packages/renderless/src/date-panel/vue.ts @@ -135,7 +135,7 @@ const initState = ({ reactive, computed, api, i18n, designConfig }) => { isShowTz: computed(() => state.showTimezone && state.showTime), isShowFooter: computed(() => state.footerVisible && [DATEPICKER.Date, DATEPICKER.Year].includes(state.currentView)), buttonType: designConfig?.state?.buttonType || 'default', - buttonSize: designConfig?.state?.buttonSize || 'default' + buttonSize: designConfig?.state?.buttonSize || '' }) state.needChangeTimezoneData = true // 控制重新渲染时区列表