fix: declare tag props

pull/2950/head
Amour1688 2020-10-04 18:38:44 +08:00
parent 13413df0d1
commit 4446a77784
1 changed files with 42 additions and 49 deletions

View File

@ -6,10 +6,9 @@ import {
SetupContext, SetupContext,
App, App,
VNodeTypes, VNodeTypes,
CSSProperties, watchEffect,
} from 'vue'; } from 'vue';
import classNames from '../_util/classNames'; import classNames from '../_util/classNames';
import omit from 'omit.js';
import CloseOutlined from '@ant-design/icons-vue/CloseOutlined'; import CloseOutlined from '@ant-design/icons-vue/CloseOutlined';
import Wave from '../_util/wave'; import Wave from '../_util/wave';
import { import {
@ -27,11 +26,9 @@ const PresetStatusColorRegex = new RegExp(`^(${PresetStatusColorTypes.join('|')}
export interface TagProps extends HTMLAttributes { export interface TagProps extends HTMLAttributes {
prefixCls?: string; prefixCls?: string;
class?: string;
color?: LiteralUnion<PresetColorType | PresetStatusColorType, string>; color?: LiteralUnion<PresetColorType | PresetStatusColorType, string>;
closable?: boolean; closable?: boolean;
closeIcon?: VNodeTypes; closeIcon?: VNodeTypes;
style?: CSSProperties;
visible?: boolean; visible?: boolean;
onClose?: (e: MouseEvent) => void; onClose?: (e: MouseEvent) => void;
icon?: VNodeTypes; icon?: VNodeTypes;
@ -39,32 +36,22 @@ export interface TagProps extends HTMLAttributes {
const Tag = defineComponent({ const Tag = defineComponent({
name: 'ATag', name: 'ATag',
inheritAttrs: false, emits: ['update:visible'],
setup(_: TagProps, { slots, attrs }: SetupContext) { setup(props: TagProps, { slots, emit, attrs }: SetupContext) {
const { getPrefixCls } = inject('configProvider', defaultConfigProvider); const { getPrefixCls } = inject('configProvider', defaultConfigProvider);
const visible = ref(true); const visible = ref(true);
const props = attrs as TagProps;
return () => {
const {
prefixCls: customizePrefixCls,
icon,
color,
closeIcon,
class: className,
style = {},
closable = false,
...restProps
} = props;
watchEffect(() => {
if ('visible' in props) { if ('visible' in props) {
visible.value = props.visible!; visible.value = props.visible!;
} }
});
const handleCloseClick = (e: MouseEvent) => { const handleCloseClick = (e: MouseEvent) => {
e.stopPropagation(); e.stopPropagation();
if (props.onClose) { if (props.onClose) {
emit('update:visible', false);
props.onClose(e); props.onClose(e);
} }
@ -77,12 +64,22 @@ const Tag = defineComponent({
}; };
const isPresetColor = (): boolean => { const isPresetColor = (): boolean => {
const { color } = props;
if (!color) { if (!color) {
return false; return false;
} }
return PresetColorRegex.test(color) || PresetStatusColorRegex.test(color); return PresetColorRegex.test(color) || PresetStatusColorRegex.test(color);
}; };
return () => {
const {
prefixCls: customizePrefixCls,
icon,
color,
closeIcon = slots.closeIcon?.(),
closable = false,
} = props;
const presetColor = isPresetColor(); const presetColor = isPresetColor();
const prefixCls = getPrefixCls('tag', customizePrefixCls); const prefixCls = getPrefixCls('tag', customizePrefixCls);
@ -101,20 +98,14 @@ const Tag = defineComponent({
const tagStyle = { const tagStyle = {
backgroundColor: color && !isPresetColor() ? color : undefined, backgroundColor: color && !isPresetColor() ? color : undefined,
...style,
}; };
const tagClassName = classNames( const tagClassName = classNames(prefixCls, {
prefixCls,
{
[`${prefixCls}-${color}`]: presetColor, [`${prefixCls}-${color}`]: presetColor,
[`${prefixCls}-has-color`]: color && !presetColor, [`${prefixCls}-has-color`]: color && !presetColor,
[`${prefixCls}-hidden`]: !visible.value, [`${prefixCls}-hidden`]: !visible.value,
}, });
className,
);
const tagProps = omit(restProps, ['visible']);
const iconNode = icon || null; const iconNode = icon || null;
const children = slots.default?.(); const children = slots.default?.();
const kids = iconNode ? ( const kids = iconNode ? (
@ -126,10 +117,10 @@ const Tag = defineComponent({
children children
); );
const isNeedWave = 'onClick' in props; const isNeedWave = 'onClick' in attrs;
const tagNode = ( const tagNode = (
<span {...tagProps} class={tagClassName} style={tagStyle}> <span v-show={visible.value} class={tagClassName} style={tagStyle}>
{kids} {kids}
{renderCloseIcon()} {renderCloseIcon()}
</span> </span>
@ -140,6 +131,8 @@ const Tag = defineComponent({
}, },
}); });
Tag.props = ['prefixCls', 'color', 'closable', 'closeIcon', 'visible', 'icon'];
Tag.CheckableTag = CheckableTag; Tag.CheckableTag = CheckableTag;
Tag.install = (app: App) => { Tag.install = (app: App) => {