chore: merge

This commit is contained in:
chenjiahan 2021-02-12 13:04:20 +08:00
parent 7e330109b3
commit 30254b0420

View File

@ -38,8 +38,6 @@ export type PickerOption =
[key: string]: any;
};
export type PickerPlainColumn = PickerOption[];
export type PickerObjectColumn = {
values?: PickerOption[];
children?: PickerColumn;
@ -49,7 +47,7 @@ export type PickerObjectColumn = {
[key: string]: any;
};
export type PickerColumn = PickerPlainColumn | PickerObjectColumn;
export type PickerColumn = PickerOption[] | PickerObjectColumn;
function isOptionDisabled(option: PickerOption) {
return isObject(option) && option.disabled;