Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
3 changes: 3 additions & 0 deletions src/form/form.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ export const LabelPosition = {

export const FormItemWidth = {
Small: 'small',
/**
* @deprecated Prefer to 'Large'
*/
Medium: 'medium',
Large: 'large',
} as const;
Expand Down
4 changes: 2 additions & 2 deletions src/select/multi-select/multi-select.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<aui-tag
*ngFor="let option of selectedOptions$ | async; trackBy: trackByValue"
type="info"
[round]="true"
[border]="true"
[round]="false"
[border]="false"
[size]="tagSize"
[closeable]="!disabled && !option.disabled"
(close)="removeValue(option.value)"
Expand Down
4 changes: 2 additions & 2 deletions src/tag/tag.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

&--mini {
padding: 0 use-var(inline-padding-xs);
height: 20px;
height: 18px;
@include text-set(s);

&.isRound {
Expand Down Expand Up @@ -133,7 +133,7 @@

&--info {
color: use-rgb(n-2);
background-color: use-rgb(n-8);
background-color: use-rgb(n-7);

&.hasBorder {
border-color: use-rgb(n-7);
Expand Down
2 changes: 1 addition & 1 deletion src/tag/tag.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class TagComponent {
invalid = false;

@Input()
round = true;
round = false;

@Input()
color = '';
Expand Down
2 changes: 1 addition & 1 deletion src/theme/_theme-preset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
--aui-border-radius-l: 4px;
--aui-border-radius-m: 2px;
--aui-form-item-width-l: 732px;
--aui-form-item-width-m: 436px;
--aui-form-item-width-m: 732px;
--aui-form-item-width-s: 140px;
}

Expand Down
2 changes: 1 addition & 1 deletion stories/tag/basic.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default class TagBasicComponent {
* 是否为圆角
*/
@Input()
round = true;
round = false;

/**
* hover是下划线
Expand Down
2 changes: 1 addition & 1 deletion stories/tag/basic.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const Basic: Story = {
size: 'medium',
closeable: false,
invalid: false,
round: true,
round: false,
allowClick: false,
},
parameters: {
Expand Down
2 changes: 1 addition & 1 deletion stories/tag/tag.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import * as icon from './icon.stories';
| size | ComponentSize | ComponentSize.Medium | 标签大小 |
| color | string | - | 自定义颜色, `'BORDER_COLOR[,BACKGOUNRD_COLOR]'` |
| border | boolean | false | 是否添加边框 |
| round | boolean | true | 是否为圆角 |
| round | boolean | false | 是否为圆角 |
| closeable | boolean | false | 是否可以关闭 |
| solid | boolean | false | 是否为实心 |
| invalid | boolean | false | 是否无效 |
Expand Down