Browse Source

chore: resolve conflict

pull/36910/head
二货机器人 2 years ago
parent
commit
d8af28cb83
  1. 4
      components/date-picker/generatePicker/generateRangePicker.tsx

4
components/date-picker/generatePicker/generateRangePicker.tsx

@ -50,7 +50,6 @@ export default function generateRangePicker<DateType>(
popupClassName, popupClassName,
dropdownClassName, dropdownClassName,
status: customStatus, status: customStatus,
dropdownClassName,
...restProps ...restProps
} = props; } = props;
@ -113,7 +112,6 @@ export default function generateRangePicker<DateType>(
} }
disabled={mergedDisabled} disabled={mergedDisabled}
ref={innerRef} ref={innerRef}
dropdownClassName={popupClassName || dropdownClassName}
dropdownAlign={transPlacement2DropdownAlign(direction, placement)} dropdownAlign={transPlacement2DropdownAlign(direction, placement)}
placeholder={getRangePlaceholder(picker, locale, placeholder)} placeholder={getRangePlaceholder(picker, locale, placeholder)}
suffixIcon={suffixNode} suffixIcon={suffixNode}
@ -145,7 +143,7 @@ export default function generateRangePicker<DateType>(
generateConfig={generateConfig} generateConfig={generateConfig}
components={Components} components={Components}
direction={direction} direction={direction}
dropdownClassName={classNames(hashId, dropdownClassName)} dropdownClassName={classNames(hashId, popupClassName || dropdownClassName)}
/> />
); );
}} }}

Loading…
Cancel
Save