fix: show in popover will be autop
This commit is contained in:
parent
c762efc03b
commit
ab530335b4
@ -15,6 +15,7 @@ export const EllipsisWithTooltip = (props) => {
|
|||||||
if (!props.ellipsis) {
|
if (!props.ellipsis) {
|
||||||
return <>{props.children}</>;
|
return <>{props.children}</>;
|
||||||
}
|
}
|
||||||
|
const { popoverContent } = props;
|
||||||
return (
|
return (
|
||||||
<Popover
|
<Popover
|
||||||
visible={ellipsis && visible}
|
visible={ellipsis && visible}
|
||||||
@ -28,7 +29,7 @@ export const EllipsisWithTooltip = (props) => {
|
|||||||
overflowX: 'auto',
|
overflowX: 'auto',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{props.children}
|
{popoverContent}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
@ -34,18 +34,17 @@ ReadPretty.TextArea = (props) => {
|
|||||||
const prefixCls = usePrefixCls('description-textarea', props);
|
const prefixCls = usePrefixCls('description-textarea', props);
|
||||||
const compile = useCompile();
|
const compile = useCompile();
|
||||||
const value = compile(props.value ?? '');
|
const value = compile(props.value ?? '');
|
||||||
const { autop = true } = props;
|
const { autop = false } = props;
|
||||||
let content = null;
|
let content = null;
|
||||||
if (autop) {
|
const values = HTMLEncode(value).split('\n').join('<br/>');
|
||||||
const values = HTMLEncode(value).split('\n').join('<br/>');
|
content = (
|
||||||
content = (
|
<EllipsisWithTooltip
|
||||||
<EllipsisWithTooltip ellipsis={props.ellipsis}>
|
ellipsis={props.ellipsis}
|
||||||
<div dangerouslySetInnerHTML={{ __html: values }} />
|
popoverContent={autop ? <div dangerouslySetInnerHTML={{ __html: values }} /> : value}
|
||||||
</EllipsisWithTooltip>
|
>
|
||||||
);
|
{value}
|
||||||
} else {
|
</EllipsisWithTooltip>
|
||||||
content = <EllipsisWithTooltip ellipsis={props.ellipsis}>{compile(props.value)}</EllipsisWithTooltip>;
|
);
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={cls(prefixCls, props.className)} style={props.style}>
|
<div className={cls(prefixCls, props.className)} style={props.style}>
|
||||||
|
Loading…
Reference in New Issue
Block a user