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

fix: 修复 panel-click 事件失效问题 #1421

Merged
merged 2 commits into from
Aug 31, 2022
Merged

fix: 修复 panel-click 事件失效问题 #1421

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
27d46d5
fix: 修复 panel-click 事件失效问题
honkinglin Aug 30, 2022
2ae8386
fix: 修复 panel-click 事件失效问题
honkinglin Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_common
Open in desktop
Submodule _common updated 2 files
+2 −3 style/web/components/date-picker/_index.less
+1 −0 style/web/components/message/_index.less
6 changes: 6 additions & 0 deletions src/date-picker/DatePickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@ export default defineComponent({
});
}

function onPanelClick(context: { e: MouseEvent }) {
props.onPanelClick?.(context);
emit('panel-click', context);
}

const panelProps = computed(() => ({
value: cacheValue.value as string,
year: year.value,
Expand All @@ -230,6 +235,7 @@ export default defineComponent({
timePickerProps: props.timePickerProps,
enableTimePicker: props.enableTimePicker,
presetsPlacement: props.presetsPlacement,
onPanelClick,
onCellClick,
onJumperClick,
onConfirmClick,
Expand Down
6 changes: 6 additions & 0 deletions src/date-picker/DateRangePickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,11 @@ export default defineComponent({
});
}

function onPanelClick(context: { e: MouseEvent }) {
props.onPanelClick?.(context);
emit('panel-click', context);
}

const panelProps = computed(() => ({
hoverValue: (isHoverCell.value ? hoverValue.value : []) as string[],
value: (isSelected.value ? cacheValue.value : value.value) as string[],
Expand All @@ -345,6 +350,7 @@ export default defineComponent({
enableTimePicker: props.enableTimePicker,
presetsPlacement: props.presetsPlacement,
panelPreselection: props.panelPreselection,
onPanelClick,
onCellClick,
onCellMouseEnter,
onCellMouseLeave,
Expand Down
27 changes: 22 additions & 5 deletions src/date-picker/_example/panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
<template>
<t-space direction="vertical">
<div class="date-picker-panel-border">
<t-date-picker-panel @cell-click="handleCellClick" :on-change="handleChange" />
<t-date-picker-panel @panel-click="handlePanelClick" @cell-click="handleCellClick" :on-change="handleChange" />
</div>
<div class="date-picker-panel-border">
<t-date-picker-panel enable-time-picker @cell-click="handleCellClick" :on-change="handleChange" />
<t-date-picker-panel
enable-time-picker
@panel-click="handlePanelClick"
@cell-click="handleCellClick"
:on-change="handleChange"
/>
</div>

<div class="date-picker-panel-border">
<t-date-range-picker-panel @cell-click="handleCellClick" :on-change="handleChange" />
<t-date-range-picker-panel
@panel-click="handlePanelClick"
@cell-click="handleCellClick"
:on-change="handleChange"
/>
</div>
<div class="date-picker-panel-border">
<t-date-range-picker-panel enable-time-picker @cell-click="handleCellClick" :on-change="handleChange" />
<t-date-range-picker-panel
enable-time-picker
@panel-click="handlePanelClick"
@cell-click="handleCellClick"
:on-change="handleChange"
/>
</div>
</t-space>
</template>
Expand All @@ -23,7 +37,10 @@ export default {
console.log('onChange value', value);
},
handleCellClick(value) {
console.log('onPick value', value);
console.log('onCellClick value', value);
},
handlePanelClick(ctx) {
console.log('onPanelClick', ctx);
},
},
};
Expand Down
6 changes: 5 additions & 1 deletion src/date-picker/base/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ export default defineComponent({
value: this.month,
options: monthOptions,
onChange: (val: number) => this.onMonthChange?.(val),
popupProps: { overlayClassName: `${COMPONENT_NAME}-controller-month-popup` },
popupProps: {
attach: (triggerElement: HTMLElement) => triggerElement.parentNode,
overlayClassName: `${COMPONENT_NAME}-controller-month-popup`,
},
},
}}
/>
Expand All @@ -177,6 +180,7 @@ export default defineComponent({
onChange: (val: number) => this.onYearChange?.(val),
popupProps: {
onScroll: this.handleScroll,
attach: (triggerElement: HTMLElement) => triggerElement.parentNode,
overlayClassName: `${COMPONENT_NAME}-controller-year-popup`,
},
panelTopContent: () => (
Expand Down