feat(table): align table design in fe #2102
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import React from 'react'; | ||
| import { Button } from 'antd'; | ||
| import type { ButtonProps } from 'antd/lib/button'; | ||
| import { | ||
| CheckCircle, | ||
| Copy, | ||
| ExternalLink, | ||
| Eye, | ||
| Link as LinkIcon, | ||
| MoreVertical, | ||
| Network, | ||
| Pencil, | ||
| Play, | ||
| Search, | ||
| Settings, | ||
| ShieldCheck, | ||
| Sparkles, | ||
| Trash2, | ||
| } from 'lucide-react'; | ||
| import classNames from 'classnames'; | ||
| import { Link, LinkProps } from 'react-router-dom'; | ||
|
|
||
| const tableActionIconMap = { | ||
| default: CheckCircle, | ||
| edit: Pencil, | ||
| view: Eye, | ||
| settings: Settings, | ||
| access: Network, | ||
| permission: ShieldCheck, | ||
| copy: Copy, | ||
| delete: Trash2, | ||
| run: Play, | ||
| search: Search, | ||
| open: ExternalLink, | ||
| link: LinkIcon, | ||
| ai: Sparkles, | ||
| }; | ||
|
|
||
| export type TableActionIconName = keyof typeof tableActionIconMap; | ||
|
|
||
| export function TableActionIcon({ name }: { name: TableActionIconName }) { | ||
| const Icon = tableActionIconMap[name]; | ||
| return <Icon className='fc-table-action-menu-icon' />; | ||
| } | ||
|
|
||
| interface TableActionButtonProps extends Omit<ButtonProps, 'icon'> { | ||
| actionIcon?: TableActionIconName; | ||
| icon?: React.ReactNode; | ||
| } | ||
|
|
||
| export function TableActionButton({ actionIcon, icon, className, type = 'link', ...rest }: TableActionButtonProps) { | ||
| return ( | ||
| <Button | ||
| type={type} | ||
| className={classNames('fc-table-action-menu-button', className)} | ||
| icon={icon || (actionIcon ? <TableActionIcon name={actionIcon} /> : undefined)} | ||
| {...rest} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| interface TableActionLinkProps extends LinkProps { | ||
| actionIcon?: TableActionIconName; | ||
| } | ||
|
|
||
| export function TableActionLink({ actionIcon, className, children, ...rest }: TableActionLinkProps) { | ||
| return ( | ||
| <Link className={classNames('fc-table-action-menu-link', className)} {...rest}> | ||
| {actionIcon && <TableActionIcon name={actionIcon} />} | ||
| <span>{children}</span> | ||
| </Link> | ||
| ); | ||
| } | ||
|
|
||
| export const TableActionTrigger = React.forwardRef<HTMLElement, ButtonProps>(function TableActionTrigger({ type = 'text', icon, ...rest }, ref) { | ||
| return <Button ref={ref as any} type={type} icon={icon || <MoreVertical size={16} />} {...rest} />; | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| import React from 'react'; | ||
| import { Popover, Tooltip } from 'antd'; | ||
| import { Link } from 'react-router-dom'; | ||
| import type { LinkProps } from 'react-router-dom'; | ||
| import _ from 'lodash'; | ||
|
|
||
| import './style.less'; | ||
|
|
||
| export interface TableTagItem { | ||
| key?: React.Key; | ||
| label: React.ReactNode; | ||
| tooltip?: React.ReactNode; | ||
| to?: LinkProps['to']; | ||
| onClick?: () => void; | ||
| } | ||
|
|
||
| interface Props<T = any> { | ||
| data?: T[]; | ||
| maxVisible?: number; | ||
| maxTagWidth?: number | string; | ||
| emptyText?: React.ReactNode; | ||
| getKey?: (item: T, index: number) => React.Key; | ||
| getLabel?: (item: T, index: number) => React.ReactNode; | ||
| getTooltip?: (item: T, index: number) => React.ReactNode; | ||
| getLinkTo?: (item: T, index: number) => LinkProps['to'] | undefined; | ||
| linkTarget?: string; | ||
| onTagClick?: (item: T, index: number) => void; | ||
| } | ||
|
|
||
| function getDefaultLabel(item: any) { | ||
| if (_.isObject(item) && 'label' in item) { | ||
| return item.label; | ||
| } | ||
| return item; | ||
| } | ||
|
|
||
| function getDefaultKey(item: any, index: number): React.Key { | ||
| if (_.isObject(item) && 'key' in item && item.key !== undefined) { | ||
| return item.key as React.Key; | ||
| } | ||
| return `${getDefaultLabel(item)}-${index}`; | ||
| } | ||
|
|
||
| function isEmptyLabel(label: React.ReactNode) { | ||
| return label === undefined || label === null || label === ''; | ||
| } | ||
|
|
||
| export default function TableTags<T = any>(props: Props<T>) { | ||
| const { data, maxVisible = 2, maxTagWidth = 160, emptyText = '-', getKey, getLabel, getTooltip, getLinkTo, linkTarget, onTagClick } = props; | ||
| const items = _.filter(data || [], (item, index) => !isEmptyLabel(getLabel ? getLabel(item, index) : getDefaultLabel(item))); | ||
|
|
||
| if (_.isEmpty(items)) { | ||
| return <>{emptyText}</>; | ||
| } | ||
|
|
||
| const getItemLabel = (item: T, index: number) => (getLabel ? getLabel(item, index) : getDefaultLabel(item)); | ||
| const getItemTooltip = (item: T, index: number) => { | ||
| if (getTooltip) return getTooltip(item, index); | ||
| if (_.isObject(item) && 'tooltip' in (item as any)) return (item as any).tooltip; | ||
| return getItemLabel(item, index); | ||
| }; | ||
| const getItemLinkTo = (item: T, index: number) => { | ||
| if (getLinkTo) return getLinkTo(item, index); | ||
| if (_.isObject(item) && 'to' in (item as any)) return (item as any).to; | ||
| return undefined; | ||
| }; | ||
|
|
||
| const renderTag = (item: T, index: number, inPopover = false) => { | ||
| const label = getItemLabel(item, index); | ||
| const tooltip = getItemTooltip(item, index); | ||
| const linkTo = getItemLinkTo(item, index); | ||
| const clickable = !!linkTo || !!onTagClick || (_.isObject(item) && 'onClick' in (item as any)); | ||
| const style: React.CSSProperties = { | ||
| maxWidth: inPopover ? 320 : maxTagWidth, | ||
| }; | ||
| const tag = ( | ||
| <span | ||
| className={`fc-table-tag${clickable ? ' fc-table-tag-clickable' : ''}`} | ||
| style={style} | ||
| onClick={(e) => { | ||
| e.stopPropagation(); | ||
| if (_.isObject(item) && 'onClick' in (item as any)) { | ||
| (item as any).onClick?.(); | ||
| } | ||
| onTagClick?.(item, index); | ||
| }} | ||
|
Comment on lines
+80
to
+86
There was a problem hiding this comment. Avoid blocking row click for non-interactive tags.
Suggested fix- <span
+ <span
className={`fc-table-tag${clickable ? ' fc-table-tag-clickable' : ''}`}
style={style}
- onClick={(e) => {
- e.stopPropagation();
- if (_.isObject(item) && 'onClick' in (item as any)) {
- (item as any).onClick?.();
- }
- onTagClick?.(item, index);
- }}
+ onClick={
+ clickable
+ ? (e) => {
+ e.stopPropagation();
+ if (_.isObject(item) && 'onClick' in (item as any)) {
+ (item as any).onClick?.();
+ }
+ onTagClick?.(item, index);
+ }
+ : undefined
+ }
>🤖 Prompt for AI Agents |
||
| > | ||
| {label} | ||
| </span> | ||
| ); | ||
|
|
||
| const content = linkTo ? ( | ||
| <Link to={linkTo} target={linkTarget} onClick={(e) => e.stopPropagation()}> | ||
| {tag} | ||
| </Link> | ||
| ) : ( | ||
| tag | ||
| ); | ||
|
|
||
| return ( | ||
| <Tooltip key={String(getKey ? getKey(item, index) : getDefaultKey(item, index))} title={tooltip}> | ||
| {content} | ||
| </Tooltip> | ||
| ); | ||
| }; | ||
|
|
||
| const visibleItems = items.slice(0, maxVisible); | ||
| const overflowItems = items.slice(maxVisible); | ||
|
|
||
| return ( | ||
| <div className='fc-table-tags'> | ||
| {visibleItems.map((item, index) => renderTag(item, index))} | ||
| {overflowItems.length > 0 && ( | ||
| <Popover | ||
| placement='topLeft' | ||
| overlayClassName='fc-table-tags-popover' | ||
| content={<div className='fc-table-tags-popover-content'>{items.map((item, index) => renderTag(item, index, true))}</div>} | ||
| > | ||
| <span className='fc-table-tag fc-table-tag-overflow' onClick={(e) => e.stopPropagation()}> | ||
| +{overflowItems.length} | ||
| </span> | ||
| </Popover> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| .fc-table-tags { | ||
| display: inline-flex; | ||
| max-width: 100%; | ||
| align-items: center; | ||
| gap: 4px; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| .fc-table-tag { | ||
| display: inline-block; | ||
| height: 22px; | ||
| max-width: 160px; | ||
| padding: 0 8px; | ||
| overflow: hidden; | ||
| color: var(--fc-text-2); | ||
| font-size: 12px; | ||
| font-weight: 400; | ||
| line-height: 20px; | ||
| text-overflow: ellipsis; | ||
| white-space: nowrap; | ||
| vertical-align: middle; | ||
| background: var(--fc-fill-2-5); | ||
| border: 1px solid var(--fc-border-color); | ||
| border-radius: 4px; | ||
| cursor: default; | ||
| } | ||
|
|
||
| .fc-table-tag-overflow { | ||
| color: var(--fc-text-3); | ||
| cursor: pointer; | ||
| background: var(--fc-fill-3); | ||
| } | ||
|
|
||
| .fc-table-tag-clickable { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .fc-table-tag-clickable:hover, | ||
| .fc-table-tag-overflow:hover { | ||
| color: var(--fc-text-1); | ||
| background: var(--fc-fill-3); | ||
| border-color: var(--fc-border-color-hover, var(--fc-border-color)); | ||
| } | ||
|
|
||
| .fc-table-tags-popover-content { | ||
| display: flex; | ||
| max-width: 360px; | ||
| flex-wrap: wrap; | ||
| gap: 6px; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.