Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: [date-pick] support footer slot #16378

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Feat: [date-pick] support footer slot #16378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7163edb
feat(components): [date-pick] support footer slot of date-picker
wuhaohuang Apr 3, 2024
3ced0e1
test(components): [date-pick] cases with/without incoming footer slot
wuhaohuang Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 46 additions & 0 deletions packages/components/date-picker/__tests__/date-picker.test.ts
View file
Open in desktop
Expand Up @@ -560,6 +560,52 @@ describe('DatePicker', () => {
expect(!!text).toBeTruthy()
})

it('footer slot', async () => {
const ParentComponent = {
components: {
'el-date-picker': DatePicker,
},
template: `
<el-date-picker
v-model="value"
>
<template #footer>
<div class="test-component">Test Component Content</div>
</template>
</el-date-picker>
`,
data() {
return { value: '' }
},
}

mount(ParentComponent)

expect(
document.querySelector('.el-picker-panel__footer__slot>.test-component')
).toBeTruthy()
})

it('no footer slot', () => {
const ParentComponent = {
components: {
'el-date-picker': DatePicker,
},
template: `
<el-date-picker
v-model="value"
/>
`,
data() {
return { value: '' }
},
}

mount(ParentComponent)

expect(document.querySelector('.el-picker-panel__footer__slot')).toBeNull()
})

describe('value-format', () => {
it('with literal string', async () => {
const day = dayjs()
Expand Down
50 changes: 30 additions & 20 deletions packages/components/date-picker/src/date-picker-com/panel-date-pick.vue
View file
Open in desktop
Expand Up @@ -159,26 +159,36 @@
</div>
</div>
</div>
<div v-show="footerVisible" :class="ppNs.e('footer')">
<el-button
v-show="selectionMode !== 'dates' && selectionMode !== 'years'"
text
size="small"
:class="ppNs.e('link-btn')"
:disabled="disabledNow"
@click="changeToNow"
>
{{ t('el.datepicker.now') }}
</el-button>
<el-button
plain
size="small"
:class="ppNs.e('link-btn')"
:disabled="disabledConfirm"
@click="onConfirm"
>
{{ t('el.datepicker.confirm') }}
</el-button>
<div
v-show="footerVisible || slots.footer"
:class="[
{ [ppNs.e('footer')]: showTime && !slots.footer },
{ [ppNs.e('footer__slot')]: slots.footer },
]"
>
<slot name="footer">
<template v-if="footerVisible">
<el-button
v-show="selectionMode !== 'dates' && selectionMode !== 'years'"
text
size="small"
:class="ppNs.e('link-btn')"
:disabled="disabledNow"
@click="changeToNow"
>
{{ t('el.datepicker.now') }}
</el-button>
<el-button
plain
size="small"
:class="ppNs.e('link-btn')"
:disabled="disabledConfirm"
@click="onConfirm"
>
{{ t('el.datepicker.confirm') }}
</el-button>
</template>
</slot>
</div>
</div>
</template>
Expand Down
51 changes: 31 additions & 20 deletions packages/components/date-picker/src/date-picker-com/panel-date-range.vue
View file
Open in desktop
Expand Up @@ -226,31 +226,41 @@
</div>
</div>
</div>
<div v-if="showTime" :class="ppNs.e('footer')">
<el-button
v-if="clearable"
text
size="small"
:class="ppNs.e('link-btn')"
@click="handleClear"
>
{{ t('el.datepicker.clear') }}
</el-button>
<el-button
plain
size="small"
:class="ppNs.e('link-btn')"
:disabled="btnDisabled"
@click="handleRangeConfirm(false)"
>
{{ t('el.datepicker.confirm') }}
</el-button>
<div
v-if="showTime || slots.footer"
:class="[
{ [ppNs.e('footer')]: showTime && !slots.footer },
{ [ppNs.e('footer__slot')]: slots.footer },
]"
>
<slot name="footer">
<template v-if="showTime">
<el-button
v-if="clearable"
text
size="small"
:class="ppNs.e('link-btn')"
@click="handleClear"
>
{{ t('el.datepicker.clear') }}
</el-button>
<el-button
plain
size="small"
:class="ppNs.e('link-btn')"
:disabled="btnDisabled"
@click="handleRangeConfirm(false)"
>
{{ t('el.datepicker.confirm') }}
</el-button>
</template>
</slot>
</div>
</div>
</template>

<script lang="ts" setup>
import { computed, inject, ref, toRef, unref } from 'vue'
import { computed, inject, ref, toRef, unref, useSlots } from 'vue'
import dayjs from 'dayjs'
import { ClickOutside as vClickoutside } from '@element-plus/directives'
import { isArray } from '@element-plus/utils'
Expand Down Expand Up @@ -300,6 +310,7 @@ const defaultValue = toRef(pickerBase.props, 'defaultValue')
const { lang } = useLocale()
const leftDate = ref<Dayjs>(dayjs().locale(lang.value))
const rightDate = ref<Dayjs>(dayjs().locale(lang.value).add(1, unit))
const slots = useSlots()

const {
minDate,
Expand Down
6 changes: 5 additions & 1 deletion packages/components/date-picker/src/date-picker.tsx
View file
Open in desktop
Expand Up @@ -81,7 +81,11 @@ export default defineComponent({
>
{{
default: (scopedProps: /**FIXME: remove any type */ any) => (
<Component {...scopedProps} />
<Component {...scopedProps}>
{{
footer: slots.footer ? slots.footer : undefined,
}}
</Component>
),
'range-separator': slots['range-separator'],
}}
Expand Down
7 changes: 7 additions & 0 deletions packages/theme-chalk/src/date-picker/picker-panel.scss
View file
Open in desktop
Expand Up @@ -36,6 +36,13 @@
font-size: 0;
}

@include e(footer__slot) {
border-top: 1px solid getCssVar('datepicker-inner-border-color');
padding: 4px 12px;
background-color: getCssVar('bg-color', 'overlay');
position: relative;
}

@include e(shortcut) {
display: block;
width: 100%;
Expand Down