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 01/10] 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 02/10] 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 03/10] 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 04/10] 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 // 控制重新渲染时区列表 From 16d1b48aa435cd99feedbabbc8b8cfab60ba9528 Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Sun, 27 Oct 2024 20:34:39 -0700 Subject: [PATCH 05/10] feat(button): [button] Optimize demo style for feature display --- .../sites/demos/pc/app/date-picker/align-composition-api.vue | 2 +- examples/sites/demos/pc/app/date-picker/align.vue | 2 +- 2 files changed, 2 insertions(+), 2 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 76b3ee515e..2cec3c8af5 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 b031f52c2d..72f1c98d1e 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 { From ad7ca1d680d2a7766078f41a377d31a3f652d33a Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Sun, 27 Oct 2024 23:44:05 -0700 Subject: [PATCH 06/10] feat(date-picker): [date-picker] Optimize demo style --- .../pc/app/date-picker/custom-suffix-icon-composition-api.vue | 2 +- examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue index 8d27563881..79ae7d8110 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue @@ -19,6 +19,6 @@ const IconMinus = iconMinus() } .my-date-picker { - background: #ddd; + background: #f0f0f0; } diff --git a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue index f222428905..3e66b38905 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue @@ -27,6 +27,6 @@ export default { } .my-date-picker { - background-color: #ddd; + background-color: #f0f0f0; } From 1afb3ce24da1199cc33f9a4749d3e1f3def5ebae Mon Sep 17 00:00:00 2001 From: You-Hw-Y <1664677472@qq.com> Date: Mon, 28 Oct 2024 07:13:45 -0700 Subject: [PATCH 07/10] feat(time-picker): [time-picker] Optimize and modify component style issues --- .../basic-usage-composition-api.vue | 2 +- .../demos/pc/app/date-picker/basic-usage.vue | 2 +- .../app/date-picker/clear-composition-api.vue | 2 +- .../sites/demos/pc/app/date-picker/clear.vue | 2 +- .../custom-suffix-icon-composition-api.vue | 2 +- .../pc/app/date-picker/custom-suffix-icon.vue | 2 +- .../custom-weeks-composition-api.vue | 2 +- .../demos/pc/app/date-picker/custom-weeks.vue | 2 +- .../default-value-composition-api.vue | 7 +----- .../pc/app/date-picker/default-value.vue | 7 +----- .../date-picker/disabled-composition-api.vue | 7 +----- .../demos/pc/app/date-picker/disabled.vue | 7 +----- .../date-picker/events-composition-api.vue | 13 ++++++----- .../sites/demos/pc/app/date-picker/events.vue | 13 ++++++----- .../filter-mode-composition-api.vue | 2 +- .../demos/pc/app/date-picker/filter-mode.vue | 2 +- .../date-picker/format-composition-api.vue | 2 +- .../sites/demos/pc/app/date-picker/format.vue | 2 +- .../label-inside-composition-api.vue | 9 +------- .../demos/pc/app/date-picker/label-inside.vue | 9 +------- .../multiple-dates-composition-api.vue | 2 +- .../pc/app/date-picker/multiple-dates.vue | 2 +- .../app/date-picker/now-composition-api.vue | 2 +- .../sites/demos/pc/app/date-picker/now.vue | 2 +- .../app/date-picker/size-composition-api.vue | 7 +----- .../sites/demos/pc/app/date-picker/size.vue | 7 +----- .../app/date-picker/step-composition-api.vue | 2 +- .../sites/demos/pc/app/date-picker/step.vue | 2 +- .../date-picker/timezone-composition-api.vue | 2 +- .../demos/pc/app/date-picker/timezone.vue | 2 +- .../unlink-panels-composition-api.vue | 2 +- .../pc/app/date-picker/unlink-panels.vue | 2 +- .../validate-event-composition-api.vue | 2 +- .../pc/app/date-picker/validate-event.vue | 2 +- .../basic-usage-composition-api.vue | 2 +- .../pc/app/time-picker/basic-usage.spec.ts | 8 +++---- .../demos/pc/app/time-picker/basic-usage.vue | 2 +- .../demos/pc/app/time-picker/format.spec.ts | 2 +- .../time-picker/is-range-composition-api.vue | 2 +- .../demos/pc/app/time-picker/is-range.vue | 2 +- .../pc/app/time-picker/webdoc/time-picker.js | 4 ++-- packages/theme/src/picker/index.less | 22 ++++++++----------- packages/theme/src/time-panel/index.less | 5 +---- packages/theme/src/time-panel/vars.less | 2 +- packages/theme/src/time-spinner/index.less | 10 ++++++++- packages/vue/src/picker/src/pc.vue | 4 ++-- packages/vue/src/time/src/pc.vue | 5 ----- 47 files changed, 79 insertions(+), 125 deletions(-) diff --git a/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue b/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue index 94afbfa07e..0bbf51d678 100644 --- a/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue @@ -23,7 +23,7 @@ const yearValue = ref('') diff --git a/examples/sites/demos/pc/app/date-picker/clear.vue b/examples/sites/demos/pc/app/date-picker/clear.vue index 29236fde9a..a13639283a 100644 --- a/examples/sites/demos/pc/app/date-picker/clear.vue +++ b/examples/sites/demos/pc/app/date-picker/clear.vue @@ -41,6 +41,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue index 79ae7d8110..8e89c78684 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue @@ -15,7 +15,7 @@ const IconMinus = iconMinus() diff --git a/examples/sites/demos/pc/app/date-picker/custom-weeks.vue b/examples/sites/demos/pc/app/date-picker/custom-weeks.vue index b3cea104c8..2f3f276df8 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-weeks.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-weeks.vue @@ -57,6 +57,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue b/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue index 0e26f8d5cc..55ee57366b 100644 --- a/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue @@ -31,12 +31,7 @@ const defaultTimeRange = ref(['09:00:00', '18:00:00']) diff --git a/examples/sites/demos/pc/app/date-picker/step.vue b/examples/sites/demos/pc/app/date-picker/step.vue index 526c475bc6..91d3b5aa4c 100644 --- a/examples/sites/demos/pc/app/date-picker/step.vue +++ b/examples/sites/demos/pc/app/date-picker/step.vue @@ -36,6 +36,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue b/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue index 90aae215fd..ac89908a3c 100644 --- a/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue @@ -45,6 +45,6 @@ function selectChange(tz) { diff --git a/examples/sites/demos/pc/app/date-picker/timezone.vue b/examples/sites/demos/pc/app/date-picker/timezone.vue index e148dc86fe..cc63e9abca 100644 --- a/examples/sites/demos/pc/app/date-picker/timezone.vue +++ b/examples/sites/demos/pc/app/date-picker/timezone.vue @@ -55,6 +55,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue b/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue index 78799e78e7..98c8f99ae8 100644 --- a/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue @@ -24,6 +24,6 @@ const value = ref([]) diff --git a/examples/sites/demos/pc/app/date-picker/unlink-panels.vue b/examples/sites/demos/pc/app/date-picker/unlink-panels.vue index fce19d102c..45443a4c9f 100644 --- a/examples/sites/demos/pc/app/date-picker/unlink-panels.vue +++ b/examples/sites/demos/pc/app/date-picker/unlink-panels.vue @@ -32,6 +32,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue b/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue index 73600329e9..514d981e0c 100644 --- a/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue @@ -84,7 +84,7 @@ function resetForm() { diff --git a/examples/sites/demos/pc/app/time-picker/is-range.vue b/examples/sites/demos/pc/app/time-picker/is-range.vue index c88c0c18b8..a7c28ee54e 100644 --- a/examples/sites/demos/pc/app/time-picker/is-range.vue +++ b/examples/sites/demos/pc/app/time-picker/is-range.vue @@ -24,6 +24,6 @@ export default { diff --git a/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js b/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js index 8093293f67..a8616d485c 100644 --- a/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js +++ b/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js @@ -22,7 +22,7 @@ export default { 'en-US': 'Select time range' }, desc: { - 'zh-CN': '
picker-options
设置固定时间范围
通过picker-options
设置固定时间范围
picker-options
Setting a fixed time range.
is-range
设置是否为范围选择,默认为 false,range-separator
,设置范围选择分隔符(为可选值)默认为 '-'。
通过is-range
设置是否为范围选择,默认为 false,通过range-separator
设置范围选择分隔符(为可选值)默认为 '-'。
is-range
whether the setting is range selection. Default is false, range-separator
, and the range selection delimiter (optional) defaults to'-'.