From 64e5beb9ece826202c11be32867169b6a8f0b86e Mon Sep 17 00:00:00 2001 From: zfitness Date: Fri, 12 Aug 2022 09:36:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20link=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add link --- site/site.config.mjs | 6 ++++ src/link/Link.tsx | 54 +++++++++++++++++++++++++++++ src/link/README.md | 3 ++ src/link/__tests__/link.test.tsx | 4 +++ src/link/_example/base.jsx | 0 src/link/_example/disabled.jsx | 0 src/link/_example/hover.jsx | 0 src/link/_example/icon.jsx | 0 src/link/_example/size.jsx | 0 src/link/_example/theme.jsx | 0 src/link/_example/underline.jsx | 0 src/link/defaultProps.ts | 7 ++++ src/link/index.ts | 9 +++++ src/link/link.en-US.md | 21 ++++++++++++ src/link/link.md | 21 ++++++++++++ src/link/style/css.js | 1 + src/link/style/index.js | 1 + src/link/type.ts | 59 ++++++++++++++++++++++++++++++++ 18 files changed, 186 insertions(+) create mode 100644 src/link/Link.tsx create mode 100644 src/link/README.md create mode 100644 src/link/__tests__/link.test.tsx create mode 100644 src/link/_example/base.jsx create mode 100644 src/link/_example/disabled.jsx create mode 100644 src/link/_example/hover.jsx create mode 100644 src/link/_example/icon.jsx create mode 100644 src/link/_example/size.jsx create mode 100644 src/link/_example/theme.jsx create mode 100644 src/link/_example/underline.jsx create mode 100644 src/link/defaultProps.ts create mode 100644 src/link/index.ts create mode 100644 src/link/link.en-US.md create mode 100644 src/link/link.md create mode 100644 src/link/style/css.js create mode 100644 src/link/style/index.js create mode 100644 src/link/type.ts diff --git a/site/site.config.mjs b/site/site.config.mjs index b0969e735..51a5b4e32 100644 --- a/site/site.config.mjs +++ b/site/site.config.mjs @@ -67,6 +67,12 @@ export default { path: '/react/components/button', component: () => import('tdesign-react/button/button.md'), }, + { + title: 'Link 文字', + name: 'link', + path: '/react/components/link', + component: () => import('tdesign-react/link/link.md'), + }, { title: 'Icon 图标', name: 'icon', diff --git a/src/link/Link.tsx b/src/link/Link.tsx new file mode 100644 index 000000000..63fa926bb --- /dev/null +++ b/src/link/Link.tsx @@ -0,0 +1,54 @@ +import classNames from 'classnames'; +import React from 'react'; +import useConfig from '../hooks/useConfig'; +import { TdLinkProps } from './type'; + +export interface LinkProps extends TdLinkProps, React.HTMLAttributes {} + +const Link = React.forwardRef( + ( + { + children, + className, + underline, + prefixIcon, + suffixIcon, + theme, + disabled, + hover = 'underline', + ...props + }: LinkProps, + ref: React.RefObject, + ) => { + const { classPrefix } = useConfig(); + + return ( + + {prefixIcon} + + {children} + + {suffixIcon} + + ); + }, +); + +Link.displayName = 'Link'; + +export default Link; diff --git a/src/link/README.md b/src/link/README.md new file mode 100644 index 000000000..e5ac36e60 --- /dev/null +++ b/src/link/README.md @@ -0,0 +1,3 @@ +:: BASE_DOC :: + +:: BASE_PROPS :: diff --git a/src/link/__tests__/link.test.tsx b/src/link/__tests__/link.test.tsx new file mode 100644 index 000000000..5b4e80e85 --- /dev/null +++ b/src/link/__tests__/link.test.tsx @@ -0,0 +1,4 @@ +import { testExamples } from '@test/utils'; + +// 测试组件代码 Example 快照 +testExamples(__dirname); diff --git a/src/link/_example/base.jsx b/src/link/_example/base.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/disabled.jsx b/src/link/_example/disabled.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/hover.jsx b/src/link/_example/hover.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/icon.jsx b/src/link/_example/icon.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/size.jsx b/src/link/_example/size.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/theme.jsx b/src/link/_example/theme.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/_example/underline.jsx b/src/link/_example/underline.jsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/link/defaultProps.ts b/src/link/defaultProps.ts new file mode 100644 index 000000000..5a4184e63 --- /dev/null +++ b/src/link/defaultProps.ts @@ -0,0 +1,7 @@ +/** + * 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC + * */ + +import { TdLinkProps } from './type'; + +export const linkDefaultProps: TdLinkProps = { hover: 'underline', theme: 'default' }; diff --git a/src/link/index.ts b/src/link/index.ts new file mode 100644 index 000000000..683e84456 --- /dev/null +++ b/src/link/index.ts @@ -0,0 +1,9 @@ +import _Link from './Link'; + +import './style/index.js'; + +export type { LinkProps } from './Link'; + +export const Link = _Link; + +export default Link; diff --git a/src/link/link.en-US.md b/src/link/link.en-US.md new file mode 100644 index 000000000..f55dbd3e3 --- /dev/null +++ b/src/link/link.en-US.md @@ -0,0 +1,21 @@ +:: BASE_DOC :: + +## API + +### Link Props + +name | type | default | description | required +-- | -- | -- | -- | -- +className | String | - | 类名 | N +style | Object | - | 样式，Typescript：`React.CSSProperties` | N +children | TNode | - | Typescript：`string | TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +content | TNode | - | Typescript：`string | TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +disabled | Boolean | - | make link to be disabled | N +hover | String | underline | hover link style。options：color/underline | N +href | String | - | \- | N +prefixIcon | TElement | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +suffixIcon | TElement | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +target | String | - | target is an attribute of `` | N +theme | String | default | options：default/primary/danger/warning/success | N +underline | Boolean | - | \- | N +onClick | Function | | Typescript：`(e: MouseEvent) => void`
click event, it won't trigger when it's disabled | N diff --git a/src/link/link.md b/src/link/link.md new file mode 100644 index 000000000..d4dee48af --- /dev/null +++ b/src/link/link.md @@ -0,0 +1,21 @@ +:: BASE_DOC :: + +## API + +### Link Props + +名称 | 类型 | 默认值 | 说明 | 必传 +-- | -- | -- | -- | -- +className | String | - | 类名 | N +style | Object | - | 样式，TS 类型：`React.CSSProperties` | N +children | TNode | - | 链接内容，同 content。TS 类型：`string | TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +content | TNode | - | 链接内容。TS 类型：`string | TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +disabled | Boolean | - | 禁用链接 | N +hover | String | underline | 链接悬浮态样式，有 文本颜色变化、添加下划线等 2 种方法。可选项：color/underline | N +href | String | - | 跳转链接 | N +prefixIcon | TElement | - | 前置图标。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +suffixIcon | TElement | - | 后置图标。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +target | String | - | 跳转方式，如：当前页面打开、新页面打开等，同 HTML 属性 target 含义相同 | N +theme | String | default | 组件风格，依次为默认色、品牌色、危险色、警告色、成功色。可选项：default/primary/danger/warning/success | N +underline | Boolean | - | 普通状态是否显示链接下划线 | N +onClick | Function | | TS 类型：`(e: MouseEvent) => void`
点击事件，禁用状态不会触发点击事件 | N diff --git a/src/link/style/css.js b/src/link/style/css.js new file mode 100644 index 000000000..6a9a4b132 --- /dev/null +++ b/src/link/style/css.js @@ -0,0 +1 @@ +import './index.css'; diff --git a/src/link/style/index.js b/src/link/style/index.js new file mode 100644 index 000000000..f2595c4e2 --- /dev/null +++ b/src/link/style/index.js @@ -0,0 +1 @@ +import '../../_common/style/web/components/link/_index.less'; diff --git a/src/link/type.ts b/src/link/type.ts new file mode 100644 index 000000000..17e39e826 --- /dev/null +++ b/src/link/type.ts @@ -0,0 +1,59 @@ +/* eslint-disable */ + +/** + * 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC + * */ + +import { TNode, TElement } from '../common'; +import { MouseEvent } from 'react'; + +export interface TdLinkProps { + /** + * 链接内容，同 content + */ + children?: TNode; + /** + * 链接内容 + */ + content?: TNode; + /** + * 禁用链接 + */ + disabled?: boolean; + /** + * 链接悬浮态样式，有 文本颜色变化、添加下划线等 2 种方法 + * @default underline + */ + hover?: 'color' | 'underline'; + /** + * 跳转链接 + * @default '' + */ + href?: string; + /** + * 前置图标 + */ + prefixIcon?: TElement; + /** + * 后置图标 + */ + suffixIcon?: TElement; + /** + * 跳转方式，如：当前页面打开、新页面打开等，同 HTML 属性 target 含义相同 + * @default '' + */ + target?: string; + /** + * 组件风格，依次为默认色、品牌色、危险色、警告色、成功色 + * @default default + */ + theme?: 'default' | 'primary' | 'danger' | 'warning' | 'success'; + /** + * 普通状态是否显示链接下划线 + */ + underline?: boolean; + /** + * 点击事件，禁用状态不会触发点击事件 + */ + onClick?: (e: MouseEvent) => void; +} From a144b14c8b5d5fdc96ef1e955a0a607374c9a3ee Mon Sep 17 00:00:00 2001 From: zfitness Date: Fri, 12 Aug 2022 16:22:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit link --- site/site.config.mjs | 12 +++---- src/_common | 2 +- src/link/Link.tsx | 38 ++++++++++---------- src/link/_example/base.jsx | 10 ++++++ src/link/_example/disabled.jsx | 26 ++++++++++++++ src/link/_example/hover.jsx | 61 +++++++++++++++++++++++++++++++++ src/link/_example/icon.jsx | 30 ++++++++++++++++ src/link/_example/size.jsx | 16 +++++++++ src/link/_example/theme.jsx | 15 ++++++++ src/link/_example/underline.jsx | 25 ++++++++++++++ src/link/defaultProps.ts | 2 +- src/link/link.en-US.md | 2 +- src/link/link.md | 2 +- src/link/type.ts | 7 +++- 14 files changed, 217 insertions(+), 31 deletions(-) diff --git a/site/site.config.mjs b/site/site.config.mjs index 51a5b4e32..505406629 100644 --- a/site/site.config.mjs +++ b/site/site.config.mjs @@ -67,18 +67,18 @@ export default { path: '/react/components/button', component: () => import('tdesign-react/button/button.md'), }, - { - title: 'Link 文字', - name: 'link', - path: '/react/components/link', - component: () => import('tdesign-react/link/link.md'), - }, { title: 'Icon 图标', name: 'icon', path: '/react/components/icon', component: () => import('tdesign-react/icon/icon.md'), }, + { + title: 'Link 文字', + name: 'link', + path: '/react/components/link', + component: () => import('tdesign-react/link/link.md'), + }, ], }, { diff --git a/src/_common b/src/_common index ed6d448f0..13f0dd7bf 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit ed6d448f04403c58d1f71e2b2a19fece4eefb22e +Subproject commit 13f0dd7bf2987acea5496acbc121365c1078d308 diff --git a/src/link/Link.tsx b/src/link/Link.tsx index 63fa926bb..9fd974212 100644 --- a/src/link/Link.tsx +++ b/src/link/Link.tsx @@ -3,7 +3,7 @@ import React from 'react'; import useConfig from '../hooks/useConfig'; import { TdLinkProps } from './type'; -export interface LinkProps extends TdLinkProps, React.HTMLAttributes {} +export interface LinkProps extends TdLinkProps, Omit, 'children'> {} const Link = React.forwardRef( ( @@ -13,7 +13,7 @@ const Link = React.forwardRef( underline, prefixIcon, suffixIcon, - theme, + theme = 'default', disabled, hover = 'underline', ...props @@ -22,28 +22,26 @@ const Link = React.forwardRef( ) => { const { classPrefix } = useConfig(); + const handleClick = () => { + console.log('a'); + }; return ( - {prefixIcon} - - {children} - - {suffixIcon} + {prefixIcon} + {children} + {suffixIcon} ); }, diff --git a/src/link/_example/base.jsx b/src/link/_example/base.jsx index e69de29bb..3615077e9 100644 --- a/src/link/_example/base.jsx +++ b/src/link/_example/base.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + + 查看链接 + + ); +} diff --git a/src/link/_example/disabled.jsx b/src/link/_example/disabled.jsx index e69de29bb..631be35fa 100644 --- a/src/link/_example/disabled.jsx +++ b/src/link/_example/disabled.jsx @@ -0,0 +1,26 @@ +import React from 'react'; +import { JumpIcon } from 'tdesign-icons-react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + + + 查看链接 + + + 查看链接 + + + 查看链接 + + + 查看链接 + + }> + 查看链接 + + + ); +} diff --git a/src/link/_example/hover.jsx b/src/link/_example/hover.jsx index e69de29bb..783a55020 100644 --- a/src/link/_example/hover.jsx +++ b/src/link/_example/hover.jsx @@ -0,0 +1,61 @@ +import React from 'react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + <> + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + + ); +} diff --git a/src/link/_example/icon.jsx b/src/link/_example/icon.jsx index e69de29bb..5ef764ddb 100644 --- a/src/link/_example/icon.jsx +++ b/src/link/_example/icon.jsx @@ -0,0 +1,30 @@ +import React from 'react'; +import { JumpIcon, LinkIcon } from 'tdesign-icons-react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + + }> + 跳转链接 + + }> + 跳转链接 + + }> + 跳转链接 + + } + disabled + > + 跳转链接 + + + ); +} diff --git a/src/link/_example/size.jsx b/src/link/_example/size.jsx index e69de29bb..7b08ad1db 100644 --- a/src/link/_example/size.jsx +++ b/src/link/_example/size.jsx @@ -0,0 +1,16 @@ +import React from 'react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + <> + + + 查看链接 + + 查看链接 + + + ); +} diff --git a/src/link/_example/theme.jsx b/src/link/_example/theme.jsx index e69de29bb..b9a052c08 100644 --- a/src/link/_example/theme.jsx +++ b/src/link/_example/theme.jsx @@ -0,0 +1,15 @@ +import React from 'react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + + 跳转链接 + 跳转链接 + 跳转链接 + 跳转链接 + 跳转链接 + + ); +} diff --git a/src/link/_example/underline.jsx b/src/link/_example/underline.jsx index e69de29bb..7f9b939eb 100644 --- a/src/link/_example/underline.jsx +++ b/src/link/_example/underline.jsx @@ -0,0 +1,25 @@ +import React from 'react'; +import { Space } from 'tdesign-react'; +import Link from '../Link'; + +export default function LinkExample() { + return ( + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + ); +} diff --git a/src/link/defaultProps.ts b/src/link/defaultProps.ts index 5a4184e63..1f9377ddd 100644 --- a/src/link/defaultProps.ts +++ b/src/link/defaultProps.ts @@ -4,4 +4,4 @@ import { TdLinkProps } from './type'; -export const linkDefaultProps: TdLinkProps = { hover: 'underline', theme: 'default' }; +export const linkDefaultProps: TdLinkProps = { hover: 'underline', size: 'medium', theme: 'default' }; diff --git a/src/link/link.en-US.md b/src/link/link.en-US.md index f55dbd3e3..5e8fd3608 100644 --- a/src/link/link.en-US.md +++ b/src/link/link.en-US.md @@ -1,7 +1,6 @@ :: BASE_DOC :: ## API - ### Link Props name | type | default | description | required @@ -14,6 +13,7 @@ disabled | Boolean | - | make link to be disabled | N hover | String | underline | hover link style。options：color/underline | N href | String | - | \- | N prefixIcon | TElement | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +size | String | medium | options：small/medium/large。Typescript：`SizeEnum`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N suffixIcon | TElement | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N target | String | - | target is an attribute of `` | N theme | String | default | options：default/primary/danger/warning/success | N diff --git a/src/link/link.md b/src/link/link.md index d4dee48af..3624f85e7 100644 --- a/src/link/link.md +++ b/src/link/link.md @@ -1,7 +1,6 @@ :: BASE_DOC :: ## API - ### Link Props 名称 | 类型 | 默认值 | 说明 | 必传 @@ -14,6 +13,7 @@ disabled | Boolean | - | 禁用链接 | N hover | String | underline | 链接悬浮态样式，有 文本颜色变化、添加下划线等 2 种方法。可选项：color/underline | N href | String | - | 跳转链接 | N prefixIcon | TElement | - | 前置图标。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N +size | String | medium | 尺寸。可选项：small/medium/large。TS 类型：`SizeEnum`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N suffixIcon | TElement | - | 后置图标。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N target | String | - | 跳转方式，如：当前页面打开、新页面打开等，同 HTML 属性 target 含义相同 | N theme | String | default | 组件风格，依次为默认色、品牌色、危险色、警告色、成功色。可选项：default/primary/danger/warning/success | N diff --git a/src/link/type.ts b/src/link/type.ts index 17e39e826..f24f6037f 100644 --- a/src/link/type.ts +++ b/src/link/type.ts @@ -4,7 +4,7 @@ * 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC * */ -import { TNode, TElement } from '../common'; +import { TNode, TElement, SizeEnum } from '../common'; import { MouseEvent } from 'react'; export interface TdLinkProps { @@ -34,6 +34,11 @@ export interface TdLinkProps { * 前置图标 */ prefixIcon?: TElement; + /** + * 尺寸 + * @default medium + */ + size?: SizeEnum; /** * 后置图标 */ From d502de9fb9f46a796a07089486688929c3207b10 Mon Sep 17 00:00:00 2001 From: zfitness Date: Fri, 12 Aug 2022 17:10:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 1 + src/link/Link.tsx | 34 +++++++++++++-------- src/link/_example/base.jsx | 8 ++--- src/link/_example/disabled.jsx | 17 ++++++----- src/link/_example/hover.jsx | 3 +- src/link/_example/icon.jsx | 3 +- src/link/_example/size.jsx | 53 ++++++++++++++++++++++++++++++--- src/link/_example/theme.jsx | 3 +- src/link/_example/underline.jsx | 3 +- 9 files changed, 87 insertions(+), 38 deletions(-) diff --git a/src/index.ts b/src/index.ts index 797bd03e3..87574a492 100644 --- a/src/index.ts +++ b/src/index.ts @@ -59,3 +59,4 @@ export * from './space'; export * from './jumper'; export * from './image'; export * from './rate'; +export * from './link'; diff --git a/src/link/Link.tsx b/src/link/Link.tsx index 9fd974212..dba3e39a2 100644 --- a/src/link/Link.tsx +++ b/src/link/Link.tsx @@ -9,6 +9,7 @@ const Link = React.forwardRef( ( { children, + content, className, underline, prefixIcon, @@ -16,32 +17,39 @@ const Link = React.forwardRef( theme = 'default', disabled, hover = 'underline', + onClick, + href, + size, ...props }: LinkProps, ref: React.RefObject, ) => { const { classPrefix } = useConfig(); - const handleClick = () => { - console.log('a'); + const childNode = content || children; + + const handleClick = (e: React.MouseEvent) => { + if (disabled) return; + onClick?.(e); }; + return ( - {prefixIcon} - {children} - {suffixIcon} + {prefixIcon && {prefixIcon}} + {childNode} + {suffixIcon && {suffixIcon}} ); }, diff --git a/src/link/_example/base.jsx b/src/link/_example/base.jsx index 3615077e9..995757b92 100644 --- a/src/link/_example/base.jsx +++ b/src/link/_example/base.jsx @@ -1,10 +1,6 @@ import React from 'react'; -import Link from '../Link'; +import { Link } from 'tdesign-react'; export default function LinkExample() { - return ( - - 查看链接 - - ); + return 查看链接; } diff --git a/src/link/_example/disabled.jsx b/src/link/_example/disabled.jsx index 631be35fa..4e3461d11 100644 --- a/src/link/_example/disabled.jsx +++ b/src/link/_example/disabled.jsx @@ -1,24 +1,27 @@ import React from 'react'; import { JumpIcon } from 'tdesign-icons-react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { + const clickLink = () => { + console.log('不触发'); + }; + return ( - + 查看链接 - + 查看链接 - + 查看链接 - + 查看链接 - }> + } onClick={clickLink}> 查看链接 diff --git a/src/link/_example/hover.jsx b/src/link/_example/hover.jsx index 783a55020..876305e07 100644 --- a/src/link/_example/hover.jsx +++ b/src/link/_example/hover.jsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( diff --git a/src/link/_example/icon.jsx b/src/link/_example/icon.jsx index 5ef764ddb..f31093d47 100644 --- a/src/link/_example/icon.jsx +++ b/src/link/_example/icon.jsx @@ -1,7 +1,6 @@ import React from 'react'; import { JumpIcon, LinkIcon } from 'tdesign-icons-react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( diff --git a/src/link/_example/size.jsx b/src/link/_example/size.jsx index 7b08ad1db..05856c107 100644 --- a/src/link/_example/size.jsx +++ b/src/link/_example/size.jsx @@ -1,15 +1,60 @@ import React from 'react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { JumpIcon } from 'tdesign-icons-react'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( <> - 查看链接 + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + }> + 跳转链接 + + + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + }> + 跳转链接 + + + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + + 跳转链接 + + }> + 跳转链接 - 查看链接 ); diff --git a/src/link/_example/theme.jsx b/src/link/_example/theme.jsx index b9a052c08..5b470f8d3 100644 --- a/src/link/_example/theme.jsx +++ b/src/link/_example/theme.jsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( diff --git a/src/link/_example/underline.jsx b/src/link/_example/underline.jsx index 7f9b939eb..dd5927bd7 100644 --- a/src/link/_example/underline.jsx +++ b/src/link/_example/underline.jsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Space } from 'tdesign-react'; -import Link from '../Link'; +import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( From dd9214b5c3b2ae20f8d94c6ce229328d78feee87 Mon Sep 17 00:00:00 2001 From: zfitness Date: Fri, 12 Aug 2022 17:29:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?docs:=20=E2=9C=8F=EF=B8=8F=20demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/link/_example/hover.jsx | 4 ++-- src/link/_example/size.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/link/_example/hover.jsx b/src/link/_example/hover.jsx index 876305e07..db985fcad 100644 --- a/src/link/_example/hover.jsx +++ b/src/link/_example/hover.jsx @@ -3,7 +3,7 @@ import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( - <> + 跳转链接 @@ -55,6 +55,6 @@ export default function LinkExample() { 跳转链接 - + ); } diff --git a/src/link/_example/size.jsx b/src/link/_example/size.jsx index 05856c107..a5df51805 100644 --- a/src/link/_example/size.jsx +++ b/src/link/_example/size.jsx @@ -4,7 +4,7 @@ import { Space, Link } from 'tdesign-react'; export default function LinkExample() { return ( - <> + 跳转链接 @@ -56,6 +56,6 @@ export default function LinkExample() { 跳转链接 - + ); } From 263ef2f59589a39727ec88b490585270609313ae Mon Sep 17 00:00:00 2001 From: zfitness Date: Fri, 12 Aug 2022 20:03:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?docs:=20=E2=9C=8F=EF=B8=8F=20remove=20READM?= =?UTF-8?q?E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/link/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 src/link/README.md diff --git a/src/link/README.md b/src/link/README.md deleted file mode 100644 index e5ac36e60..000000000 --- a/src/link/README.md +++ /dev/null @@ -1,3 +0,0 @@ -:: BASE_DOC :: - -:: BASE_PROPS :: From 9fde83ad6b07cfc546da574e04add4d0aa4b72eb Mon Sep 17 00:00:00 2001 From: zfitness Date: Mon, 15 Aug 2022 16:14:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20common?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit common --- src/_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_common b/src/_common index 13f0dd7bf..8e5657ab3 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 13f0dd7bf2987acea5496acbc121365c1078d308 +Subproject commit 8e5657ab31dbdd524b69f51f03a4f5aacb426962