diff --git a/CHANGELOG.md b/CHANGELOG.md index 22a85692ab8306cb43266c9ff59132ce67838f05..e2bbd126e6f2ba6e480115f0c996d973bd479306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Change + +- 更新日历模式日期选择公共组件接收参数enablededit,用于判断是否支持显示编辑模式 + ## [0.0.43] - 2024-12-22 ### Added diff --git a/src/common/date-range-picker/date-range-picker.scss b/src/common/date-range-picker/date-range-picker.scss index 7ea0ac844661a6bba94de24848d1d698f7dced32..9b43458955937dc3016ce86e4e84f10cd14d916f 100644 --- a/src/common/date-range-picker/date-range-picker.scss +++ b/src/common/date-range-picker/date-range-picker.scss @@ -4,6 +4,7 @@ width: 100%; height: 100%; @include e('header') { + flex-shrink: 0; padding: 0 16px; color: getCssVar(color, default); background-color: getCssVar(color, primary); @@ -85,6 +86,21 @@ gap: getCssVar(spacing, base); } } + @include e('custom-header') { + display: flex; + justify-content: center; + position: relative; + width: 100%; + @include m('close') { + position: absolute; + right: getCssVar(spacing, base); + } + } + @include e('calendar-container') { + flex: 1; + height: 100%; + overflow: hidden; + } } @include b('calendar-date-range-picker-calendar') { @include e('today') { @@ -106,7 +122,8 @@ line-height: var(--van-calendar-info-line-height); } } - .van-calendar__day--start,.van-calendar__day--end { + .van-calendar__day--start, + .van-calendar__day--end { @include e('today') { color: getCssVar(color, default); .ibiz-calendar-date-range-picker-calendar__today--bottom-info { @@ -115,11 +132,15 @@ } } .van-calendar__day--selected { - .van-calendar__selected-day{ + .van-calendar__selected-day { height: 100%; } @include e('today') { color: getCssVar(color, default); } } + .van-calendar__day--disabled { + color: getCssVar(color, disabled, text); + opacity: 0.7; + } } diff --git a/src/common/date-range-picker/date-range-picker.tsx b/src/common/date-range-picker/date-range-picker.tsx index 57c84ab4074aaae32863736f64705d9f053712b1..0c7e4de111d7bdab2ba44925f4f673da131ce3c9 100644 --- a/src/common/date-range-picker/date-range-picker.tsx +++ b/src/common/date-range-picker/date-range-picker.tsx @@ -43,6 +43,11 @@ export const IBizDateRangeCalendar = defineComponent({ type: Number, default: 10, }, + // 允许编辑模式 + enableEdit: { + type: Boolean, + default: true, + }, }, emits: ['cancel', 'save'], setup(props, { emit }) { @@ -85,6 +90,9 @@ export const IBizDateRangeCalendar = defineComponent({ return dayjs(_item).format(props.format); }); } + if (!props.enableEdit) { + onSave(); + } }; /** @@ -376,41 +384,64 @@ export const IBizDateRangeCalendar = defineComponent({ render() { return (