Skip to content

fix(tag): 移除tag组件 size 属性 xs 类型，统一组件size类型 #1199 #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2022
Merged

fix(tag): 移除tag组件 size 属性 xs 类型，统一组件size类型 #1199 #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/devui-vue/devui/tag/src/tag-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { PropType, ExtractPropTypes } from 'vue';

export type TagType = 'primary' | 'success' | 'warning' | 'danger';
export type SizeType = 'lg' | 'md' | 'sm' | 'xs';
export type SizeType = 'lg' | 'md' | 'sm';

export const tagProps = {
type: {
Expand All @@ -26,7 +26,7 @@ export const tagProps = {
},
size: {
type: String as PropType<SizeType>,
default: 'xs',
default: 'md',
},
} as const;

Expand Down
5 changes: 1 addition & 4 deletions packages/devui-vue/devui/tag/src/tag.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,18 @@ $font-size-map: (
lg: $devui-font-size-lg,
md: $devui-font-size-lg,
sm: $devui-font-size-sm,
xs: $devui-font-size-sm,
);

$tag-height-map: (
lg: 32px,
md: 28px,
sm: 24px,
xs: 20px,
);

$tag-line-height-map: (
lg: 30px,
md: 26px,
sm: 22px,
xs: 18px,
);

$devui-tag-normal-config: (
Expand Down Expand Up @@ -71,7 +68,7 @@ $devui-tag-normal-config: (
}
}
}
@each $size in ('lg', 'md', 'sm', 'xs') {
@each $size in ('lg', 'md', 'sm') {
&.#{$devui-prefix}-tag--#{$size} {
font-size: map-get($font-size-map, #{$size});
height: map-get($tag-height-map, #{$size});
Expand Down
34 changes: 16 additions & 18 deletions packages/devui-vue/docs/components/tag/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,19 @@ export default defineComponent({

### 不同尺寸

:::demo Tag 默认的是 xs 尺寸，还有 lg、md、sm 三种尺寸可选
:::demo Tag 默认的是 md 尺寸，有 lg、md、sm 三种尺寸可选

```vue
<template>
<div class="tag-demo-wrapper">
<d-tag type="primary" size="lg">标签二</d-tag>
<d-tag type="success" size="md">标签三</d-tag>
<d-tag type="warning" size="sm">标签四</d-tag>
<d-tag type="danger">标签五</d-tag>
<d-tag type="primary" size="lg">Large</d-tag>
<d-tag type="success" size="md">Middle</d-tag>
<d-tag type="warning" size="sm">Small</d-tag>
</div>
<div class="tag-demo-wrapper">
<d-tag type="primary" deletable size="lg">标签一</d-tag>
<d-tag type="primary" deletable size="md">标签二</d-tag>
<d-tag type="primary" deletable size="sm">标签三</d-tag>
<d-tag type="primary" deletable size="xs">标签四</d-tag>
<d-tag type="primary" deletable size="lg">Large</d-tag>
<d-tag type="primary" deletable size="md">Middle</d-tag>
<d-tag type="primary" deletable size="sm">Small</d-tag>
</div>
</template>
<script>
Expand All @@ -174,14 +172,14 @@ export default defineComponent({

### Tag 参数

| 参数 | 类型 | 默认值 | 说明 | 跳转至 Demo |
| :------------ | :-------------------- | :----- | :------------------------------------------ | :-------------------- |
| type | [TagType](#tagtype) | '' | 可选，标签的类型，指定类型后则 color 不生效 | [基本用法](#基本用法) |
| color | `string` | '' | 可选，标签的主题色 | [基本用法](#基本用法) |
| title-content | `string` | '' | 可选，设置鼠标悬浮时 title 的显示内容 | [基本用法](#基本用法) |
| checked | `boolean` | false | 可选，标签选中的初始状态 | [可被选中](#可被选中) |
| deletable | `boolean` | false | 可选，设置标签是否可删除 | [可移除的](#可移除的) |
| size | [SizeType](#sizetype) | xs | 可选，标签尺寸 | [不同尺寸](#不同尺寸) |
| 参数 | 类型 | 默认值 | 说明 | 跳转至 Demo |
| :------------ | :-------------------- |:------| :------------------------------------------ | :-------------------- |
| type | [TagType](#tagtype) | '' | 可选，标签的类型，指定类型后则 color 不生效 | [基本用法](#基本用法) |
| color | `string` | '' | 可选，标签的主题色 | [基本用法](#基本用法) |
| title-content | `string` | '' | 可选，设置鼠标悬浮时 title 的显示内容 | [基本用法](#基本用法) |
| checked | `boolean` | false | 可选，标签选中的初始状态 | [可被选中](#可被选中) |
| deletable | `boolean` | false | 可选，设置标签是否可删除 | [可移除的](#可移除的) |
| size | [SizeType](#sizetype) | 'md' | 可选，标签尺寸 | [不同尺寸](#不同尺寸) |

### Tag 事件

Expand All @@ -202,5 +200,5 @@ type TagType = 'primary' | 'success' | 'warning' | 'danger';
#### SizeType

```ts
type SizeType = 'lg' | 'md' | 'sm' | 'xs';
type SizeType = 'lg' | 'md' | 'sm';
```