From 344681e822421aa7becbb480c889ffce41766587 Mon Sep 17 00:00:00 2001
From: michael <156257964@qq.com>
Date: Sun, 4 Nov 2018 11:56:56 +0800
Subject: [PATCH] =?UTF-8?q?Ellipsis=E7=BB=84=E4=BB=B6tooltip=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=94=AF=E6=8C=81TooltipProps,=20=E4=BF=AE=E5=A4=8DEx?=
 =?UTF-8?q?ception=E7=9A=84linkElement=E7=9A=84=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20(#2713)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat:(https://github.com/ant-design/ant-design-pro/issues/2649)

* fix:(https://github.com/ant-design/ant-design-pro/issues/2674)
---
 src/components/Ellipsis/index.d.ts  |  9 ++++-
 src/components/Ellipsis/index.js    | 55 ++++++++++++++---------------
 src/components/Exception/index.d.ts |  2 +-
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/components/Ellipsis/index.d.ts b/src/components/Ellipsis/index.d.ts
index 03264aa9..6c95bc0a 100644
--- a/src/components/Ellipsis/index.d.ts
+++ b/src/components/Ellipsis/index.d.ts
@@ -1,6 +1,13 @@
 import * as React from 'react';
+import { TooltipProps } from 'antd/lib/tooltip';
+
+export interface IEllipsisTooltipProps extends TooltipProps {
+  title?: undefined;
+  overlayStyle?: undefined;
+}
+
 export interface IEllipsisProps {
-  tooltip?: boolean;
+  tooltip?: boolean | IEllipsisTooltipProps;
   length?: number;
   lines?: number;
   style?: React.CSSProperties;
diff --git a/src/components/Ellipsis/index.js b/src/components/Ellipsis/index.js
index 72fae052..a75df638 100644
--- a/src/components/Ellipsis/index.js
+++ b/src/components/Ellipsis/index.js
@@ -38,6 +38,18 @@ export const cutStrByFullLength = (str = '', maxLength) => {
   }, '');
 };
 
+const getTooltip = ({ tooltip, overlayStyle, title, children }) => {
+  if(tooltip) {
+    const props = tooltip === true ? { overlayStyle, title } : { ...tooltip, overlayStyle, title };
+    return (
+      <Tooltip {...props}>
+        {children}
+      </Tooltip>
+    )
+  }
+  return children;
+}
+
 const EllipsisText = ({ text, length, tooltip, fullWidthRecognition, ...other }) => {
   if (typeof text !== 'string') {
     throw new Error('Ellipsis children must be string.');
@@ -54,23 +66,19 @@ const EllipsisText = ({ text, length, tooltip, fullWidthRecognition, ...other })
     displayText = fullWidthRecognition ? cutStrByFullLength(text, length) : text.slice(0, length);
   }
 
-  if (tooltip) {
-    return (
-      <Tooltip overlayStyle={TooltipOverlayStyle} title={text}>
-        <span>
+  const spanAttrs = tooltip ? {} : { ...other };
+  return getTooltip(
+    {
+      tooltip,
+      overlayStyle:TooltipOverlayStyle,
+      title: text,
+      children: (
+        <span {...spanAttrs}>
           {displayText}
           {tail}
         </span>
-      </Tooltip>
-    );
-  }
-
-  return (
-    <span {...other}>
-      {displayText}
-      {tail}
-    </span>
-  );
+      )
+    });
 };
 
 export default class Ellipsis extends Component {
@@ -230,13 +238,7 @@ export default class Ellipsis extends Component {
         </div>
       );
 
-      return tooltip ? (
-        <Tooltip overlayStyle={TooltipOverlayStyle} title={children}>
-          {node}
-        </Tooltip>
-      ) : (
-        node
-      );
+      return getTooltip({ tooltip, overlayStyle:TooltipOverlayStyle, title: children, children: node });
     }
 
     const childNode = (
@@ -246,16 +248,13 @@ export default class Ellipsis extends Component {
       </span>
     );
 
+
     return (
       <div {...restProps} ref={this.handleRoot} className={cls}>
         <div ref={this.handleContent}>
-          {tooltip ? (
-            <Tooltip overlayStyle={TooltipOverlayStyle} title={text}>
-              {childNode}
-            </Tooltip>
-          ) : (
-            childNode
-          )}
+          {
+            getTooltip({ tooltip, overlayStyle:TooltipOverlayStyle, title: text, children: childNode })
+          }
           <div className={styles.shadow} ref={this.handleShadowChildren}>
             {children}
           </div>
diff --git a/src/components/Exception/index.d.ts b/src/components/Exception/index.d.ts
index d62c1771..a74abb1f 100644
--- a/src/components/Exception/index.d.ts
+++ b/src/components/Exception/index.d.ts
@@ -5,7 +5,7 @@ export interface IExceptionProps {
   desc?: React.ReactNode;
   img?: string;
   actions?: React.ReactNode;
-  linkElement?: React.ReactNode;
+  linkElement?: string | React.ComponentType;
   style?: React.CSSProperties;
   className?: string;
   backText?: React.ReactNode;
-- 
GitLab