fix: show in popover will be autop

This commit is contained in:
Semmy 2022-03-30 14:29:48 +08:00
parent c762efc03b
commit ab530335b4
2 changed files with 12 additions and 12 deletions

View File

@ -15,6 +15,7 @@ export const EllipsisWithTooltip = (props) => {
if (!props.ellipsis) {
return <>{props.children}</>;
}
const { popoverContent } = props;
return (
<Popover
visible={ellipsis && visible}
@ -28,7 +29,7 @@ export const EllipsisWithTooltip = (props) => {
overflowX: 'auto',
}}
>
{props.children}
{popoverContent}
</div>
}
>

View File

@ -34,18 +34,17 @@ ReadPretty.TextArea = (props) => {
const prefixCls = usePrefixCls('description-textarea', props);
const compile = useCompile();
const value = compile(props.value ?? '');
const { autop = true } = props;
const { autop = false } = props;
let content = null;
if (autop) {
const values = HTMLEncode(value).split('\n').join('<br/>');
content = (
<EllipsisWithTooltip ellipsis={props.ellipsis}>
<div dangerouslySetInnerHTML={{ __html: values }} />
</EllipsisWithTooltip>
);
} else {
content = <EllipsisWithTooltip ellipsis={props.ellipsis}>{compile(props.value)}</EllipsisWithTooltip>;
}
const values = HTMLEncode(value).split('\n').join('<br/>');
content = (
<EllipsisWithTooltip
ellipsis={props.ellipsis}
popoverContent={autop ? <div dangerouslySetInnerHTML={{ __html: values }} /> : value}
>
{value}
</EllipsisWithTooltip>
);
return (
<div className={cls(prefixCls, props.className)} style={props.style}>