Skip to content

Commit 4b5cd24

Browse files
daviForevelkagol
authored andcommitted
feat(date-picker-pro): 修改日历面板下侧插槽名称
1 parent 6709cd3 commit 4b5cd24

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed

packages/devui-vue/devui/date-picker-pro/__tests__/date-picker-pro.spec.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ describe('date-picker-pro test', () => {
344344
wrapper.unmount();
345345
});
346346

347-
it('date-picker-pro footerArea slot', async () => {
347+
it('date-picker-pro footer slot', async () => {
348348
const datePickerProValue = ref<Date | string>('');
349349
const setToday = () => {
350350
datePickerProValue.value = new Date();
@@ -355,7 +355,7 @@ describe('date-picker-pro test', () => {
355355
<DDatePickerPro
356356
v-model={datePickerProValue.value}
357357
v-slots={{
358-
footerArea: () => (
358+
footer: () => (
359359
<div>
360360
<DButton color="primary" onClick={setToday}>
361361
今天
@@ -373,10 +373,10 @@ describe('date-picker-pro test', () => {
373373
await nextTick();
374374
await nextTick();
375375
const pickerPanel = container.find(pickerPanelClass);
376-
const footerArea = pickerPanel.find(ns.e('panel-footer'));
377-
expect(footerArea.exists()).toBeTruthy();
376+
const footer = pickerPanel.find(ns.e('panel-footer'));
377+
expect(footer.exists()).toBeTruthy();
378378

379-
const button = footerArea.find('button');
379+
const button = footer.find('button');
380380
expect(button.exists()).toBeTruthy();
381381
await button.trigger('click');
382382

packages/devui-vue/devui/date-picker-pro/__tests__/range-date-picker-pro.spec.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import DRangeDatePickerPro from '../src/components/range-date-picker-pro';
33
import { nextTick, ref } from 'vue';
44
import { useNamespace } from '../../shared/hooks/use-namespace';
55
import DButton from '../../button/src/button';
6-
import { divide } from 'lodash';
76

87
const datePickerNs = useNamespace('date-picker-pro', true);
98
const rangeDatePickerNs = useNamespace('range-date-picker-pro', true);
@@ -299,7 +298,7 @@ describe('range-date-picker-pro test', () => {
299298
wrapper.unmount();
300299
});
301300

302-
it('range-date-picker-pro footerArea slot', async () => {
301+
it('range-date-picker-pro footer slot', async () => {
303302
const datePickerProValue = ref<(Date | string)[]>(['', '']);
304303
const setToday = () => {
305304
datePickerProValue.value = [new Date(new Date().getTime()), new Date(new Date().getTime() + 1 * 24 * 3600 * 1000)];
@@ -310,7 +309,7 @@ describe('range-date-picker-pro test', () => {
310309
<DRangeDatePickerPro
311310
v-model={datePickerProValue.value}
312311
v-slots={{
313-
footerArea: () => (
312+
footer: () => (
314313
<div>
315314
<d-button variant="solid" color="secondary" onClick={setToday}>
316315
今天
@@ -327,10 +326,10 @@ describe('range-date-picker-pro test', () => {
327326
await nextTick();
328327
await nextTick();
329328
const pickerPanel = container.find(pickerPanelClass);
330-
const footerArea = pickerPanel.find(datePickerNs.e('panel-footer'));
331-
expect(footerArea.exists()).toBeTruthy();
329+
const footer = pickerPanel.find(datePickerNs.e('panel-footer'));
330+
expect(footer.exists()).toBeTruthy();
332331

333-
const button = footerArea.find('button');
332+
const button = footer.find('button');
334333
expect(button.exists()).toBeTruthy();
335334
const date = new Date();
336335
await button.trigger('click');

packages/devui-vue/devui/date-picker-pro/src/components/date-picker-panel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export default defineComponent({
3535
{props.showTime && <TimerPickerPanel visible={props.visible} bindData={timeData.value} onSelectedTime={handlerSelectedTime} />}
3636
{ctx.slots?.rightArea && <div class={ns.e('panel-right-area')}>{ctx.slots?.rightArea()}</div>}
3737
</div>
38-
{ctx.slots?.footerArea && <div class={ns.e('panel-footer')}>{ctx.slots?.footerArea()}</div>}
39-
{!ctx.slots?.footerArea && props.showTime && (
38+
{ctx.slots?.footer && <div class={ns.e('panel-footer')}>{ctx.slots?.footer()}</div>}
39+
{!ctx.slots?.footer && props.showTime && (
4040
<div class={ns.e('panel-footer')}>
4141
<div class={ns.e('panel-footer-center')}>
4242
<Button variant="solid" onClick={handlerConfirm}>

packages/devui-vue/devui/date-picker-pro/src/components/range-date-picker-pro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default defineComponent({
4040
return () => {
4141
const vSlots = {
4242
rightArea: ctx.slots?.rightArea && (() => renderSlot(useSlots(), 'rightArea')),
43-
footerArea: ctx.slots?.footerArea && (() => renderSlot(useSlots(), 'footerArea')),
43+
footer: ctx.slots?.footer && (() => renderSlot(useSlots(), 'footer')),
4444
};
4545

4646
return (

packages/devui-vue/devui/date-picker-pro/src/date-picker-pro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default defineComponent({
3535
return () => {
3636
const vSlots = {
3737
rightArea: ctx.slots?.rightArea && (() => renderSlot(useSlots(), 'rightArea')),
38-
footerArea: ctx.slots?.footerArea && (() => renderSlot(useSlots(), 'footerArea')),
38+
footer: ctx.slots?.footer && (() => renderSlot(useSlots(), 'footer')),
3939
};
4040
return (
4141
<div class={ns.b()} ref={containerRef}>

packages/devui-vue/docs/components/date-picker-pro/index.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ export default defineComponent({
154154
</slot>
155155
</template>
156156
</d-date-picker-pro>
157-
<div class="mb10">footer area</div>
157+
<div class="mb10">footer</div>
158158
<d-date-picker-pro v-model="datePickerProValue2" class="mb20 wh250" :showTime="true">
159-
<template #footerArea>
160-
<slot name="footerArea">
159+
<template #footer>
160+
<slot name="footer">
161161
<div class="date-picker-footer">
162162
<d-button
163163
variant="solid"
@@ -371,10 +371,10 @@ export default defineComponent({
371371
</slot>
372372
</template>
373373
</d-range-date-picker-pro>
374-
<div class="mb10">footer area</div>
374+
<div class="mb10">footer</div>
375375
<d-range-date-picker-pro ref="footerCustom" v-model="datePickerProValue2" class="mb20 wh250" :showTime="true">
376-
<template #footerArea>
377-
<slot name="footerArea">
376+
<template #footer>
377+
<slot name="footer">
378378
<div class="date-picker-footer">
379379
<d-button
380380
variant="solid"
@@ -461,10 +461,10 @@ export default defineComponent({
461461

462462
### DatePickerPro 插槽
463463

464-
| 名称 | 说明 | 跳转 Demo |
465-
| :--------- | :------------------------------------------------------- | :---------------------------------------- |
466-
| rightArea | 自定义 DatePickerPro 日历面板右侧内容, 如:日期快捷选项 | [自定义日历面板区域](#自定义日历面板区域) |
467-
| footerArea | 自定义 DatePickerPro 日历面板下侧内容 | [自定义日历面板区域](#自定义日历面板区域) |
464+
| 名称 | 说明 | 跳转 Demo |
465+
| :-------- | :------------------------------------------------------- | :---------------------------------------- |
466+
| rightArea | 自定义 DatePickerPro 日历面板右侧内容, 如:日期快捷选项 | [自定义日历面板区域](#自定义日历面板区域) |
467+
| footer | 自定义 DatePickerPro 日历面板下侧内容 | [自定义日历面板区域](#自定义日历面板区域) |
468468

469469
### DatePickerPro 类型定义
470470

@@ -513,7 +513,7 @@ type Format = string;
513513

514514
### RangeDatePickerPro 插槽
515515

516-
| 名称 | 说明 | 跳转 Demo |
517-
| :--------- | :---------------------------------------------------------------- | :------------------------------------------------ |
518-
| rightArea | 自定义 RangeDatePickerPro 日历面板右侧内容, 如:日期范围快捷选项 | [自定义日期范围面板区域](#自定义日期范围面板区域) |
519-
| footerArea | 自定义 RangeDatePickerPro 日历面板下侧内容 | [自定义日期范围面板区域](#自定义日期范围面板区域) |
516+
| 名称 | 说明 | 跳转 Demo |
517+
| :-------- | :---------------------------------------------------------------- | :------------------------------------------------ |
518+
| rightArea | 自定义 RangeDatePickerPro 日历面板右侧内容, 如:日期范围快捷选项 | [自定义日期范围面板区域](#自定义日期范围面板区域) |
519+
| footer | 自定义 RangeDatePickerPro 日历面板下侧内容 | [自定义日期范围面板区域](#自定义日期范围面板区域) |

0 commit comments

Comments
 (0)