Skip to content

feat: datePicker适配非omi环境 #348

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

Open
LeonardoSya wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: datePicker适配非omi环境 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/date-picker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,15 @@ export default class DatePicker extends Component<DatePickerProps> {
* 管理value的受控/非受控状态
*/
private setupValueControl(props: DatePickerProps) {
const [value, setValue] = useControlled(props, 'value', (val, context) => props.onChange?.(val, context), {
defaultValue: props.defaultValue,
activeComponent: this,
});
const [value, setValue] = useControlled(
props,
'value',
(val, context) => this.fire('change', { value: val, ...context }),
{
defaultValue: props.defaultValue,
activeComponent: this,
},
);
this.valueState = value as DateValue;
this.setValueState = (nextValue, context) => {
setValue(nextValue, context);
Expand All @@ -117,7 +122,7 @@ export default class DatePicker extends Component<DatePickerProps> {
const [visible, setVisible] = useControlled(
props,
'popupVisible',
(val, context) => props.onVisibleChange?.(val, context),
(val, context) => this.fire('visible-change', { visible: val, ...context }),
{
defaultPopupVisible: props.defaultPopupVisible,
activeComponent: this,
Expand Down Expand Up @@ -219,7 +224,7 @@ export default class DatePicker extends Component<DatePickerProps> {
this.inputValueSignal.value = '';
this.setValueState?.(undefined, { trigger: 'clear', dayjsValue: dayjs() });
this.setPopupVisibleState?.(false, { trigger: 'clear', ...detail });
this.props.onClear?.(detail);
this.fire('clear', detail);
};

/**
Expand Down Expand Up @@ -253,7 +258,7 @@ export default class DatePicker extends Component<DatePickerProps> {
dayjsValue,
trigger: 'pick',
});
this.props.onPick?.(date, { dayjsValue, trigger: 'pick' });
this.fire('pick', { value: date, dayjsValue, trigger: 'pick' });
this.setPopupVisibleState?.(false, { trigger: 'pick' });
};

Expand Down Expand Up @@ -363,7 +368,7 @@ export default class DatePicker extends Component<DatePickerProps> {
dayjsValue,
trigger: 'preset',
});
this.props.onPresetClick?.(context);
this.fire('preset-click', context);
};

private renderPanel(props: DatePickerProps) {
Expand Down
21 changes: 13 additions & 8 deletions src/date-picker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,15 @@ export default class DateRangePicker extends Component<DateRangePickerProps> {
* 设置值的受控逻辑
*/
private setupValueControl(props: DateRangePickerProps) {
const [value, setValue] = useControlled(props, 'value', (val, context) => props.onChange?.(val, context), {
defaultValue: props.defaultValue,
activeComponent: this,
});
const [value, setValue] = useControlled(
props,
'value',
(val, context) => this.fire('change', { value: val, ...context }),
{
defaultValue: props.defaultValue,
activeComponent: this,
},
);
this.valueState = (value as DateRangeValue) || [];
this.setValueState = (nextValue, context) => {
setValue(nextValue, context);
Expand All @@ -126,7 +131,7 @@ export default class DateRangePicker extends Component<DateRangePickerProps> {
const [visible, setVisible] = useControlled(
props,
'popupVisible',
(val, context) => props.onVisibleChange?.(val, context),
(val, context) => this.fire('visible-change', { visible: val, ...context }),
{
defaultPopupVisible: props.defaultPopupVisible,
activeComponent: this,
Expand Down Expand Up @@ -222,7 +227,7 @@ export default class DateRangePicker extends Component<DateRangePickerProps> {
this.hoverValueSignal.value = ['', ''];
this.setValueState?.([], { trigger: 'clear', dayjsValue: [dayjs(), dayjs()] });
this.setPopupVisibleState?.(false, { trigger: 'clear', ...detail });
this.props.onClear?.(detail);
this.fire('clear', detail);
};

/**
Expand Down Expand Up @@ -271,7 +276,7 @@ export default class DateRangePicker extends Component<DateRangePickerProps> {
}

const dayjsValue = parseToDayjs(date, format);
this.props.onPick?.(date, { dayjsValue, trigger: 'pick', partial });
this.fire('pick', { value: date, dayjsValue, trigger: 'pick', partial });

// 首次点击不关闭，第二次点击（两端都有值）后关闭
if (isFirstClick) {
Expand Down Expand Up @@ -482,7 +487,7 @@ export default class DateRangePicker extends Component<DateRangePickerProps> {
dayjsValue: formattedPreset.map((p) => parseToDayjs(p, format)),
trigger: 'preset',
});
this.props.onPresetClick?.(context);
this.fire('preset-click', context);
};

/** 处理范围输入框变化，检测清空操作 */
Expand Down
8 changes: 4 additions & 4 deletions src/date-picker/_example/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export default class DatePickerBaseDemo extends Component {
rangeValue: ['', ''],
};

handleDateChange = (value: string) => {
this.state.dateValue = value;
handleDateChange = (e: CustomEvent) => {
this.state.dateValue = e.detail.value;
this.update();
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
4 changes: 2 additions & 2 deletions src/date-picker/_example/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default class DatePickerBaseDemo extends Component {
dateValue: '',
};

handleDateChange = (value: string) => {
this.state.dateValue = value;
handleDateChange = (e: CustomEvent) => {
this.state.dateValue = e.detail.value;
this.update();
};

Expand Down
4 changes: 2 additions & 2 deletions src/date-picker/_example/limit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export default class DatePickerLimitDemo extends Component {
rangeValue: ['', ''],
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
8 changes: 4 additions & 4 deletions src/date-picker/_example/month.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export default class DatePickerMonthDemo extends Component {
rangeValue: ['', ''],
};

handleChange = (value: string) => {
this.state.value = value;
handleChange = (e: CustomEvent) => {
this.state.value = e.detail.value;
this.update();
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
12 changes: 6 additions & 6 deletions src/date-picker/_example/presets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ export default class DatePickerPresetsDemo extends Component {
value3: ['', ''],
};

handleChange1 = (value: string) => {
this.state.value1 = value;
handleChange1 = (e: CustomEvent) => {
this.state.value1 = e.detail.value;
this.update();
};

handleChange2 = (value: string[]) => {
this.state.value2 = value;
handleChange2 = (e: CustomEvent) => {
this.state.value2 = e.detail.value;
this.update();
};

handleChange3 = (value: string[]) => {
this.state.value3 = value;
handleChange3 = (e: CustomEvent) => {
this.state.value3 = e.detail.value;
this.update();
};

Expand Down
8 changes: 4 additions & 4 deletions src/date-picker/_example/quarter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export default class DatePickerQuarterDemo extends Component {
rangeValue: ['', ''],
};

handleChange = (value: string) => {
this.state.value = value;
handleChange = (e: CustomEvent) => {
this.state.value = e.detail.value;
this.update();
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
8 changes: 4 additions & 4 deletions src/date-picker/_example/week.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export default class DatePickerWeekDemo extends Component {
rangeValue: ['', ''],
};

handleChange = (value: string) => {
this.state.value = value;
handleChange = (e: CustomEvent) => {
this.state.value = e.detail.value;
this.update();
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
8 changes: 4 additions & 4 deletions src/date-picker/_example/year.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export default class DatePickerYearDemo extends Component {
rangeValue: ['', ''],
};

handleChange = (value: string) => {
this.state.value = value;
handleChange = (e: CustomEvent) => {
this.state.value = e.detail.value;
this.update();
};

handleRangeChange = (value: string[]) => {
this.state.rangeValue = value;
handleRangeChange = (e: CustomEvent) => {
this.state.rangeValue = e.detail.value;
this.update();
};

Expand Down
Loading