Skip to content
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

Jump to bottom

fix(comp:space): empty item should be hidden #1263

Merged
merged 1 commit into from
Nov 8, 2022
Merged

fix(comp:space): empty item should be hidden #1263

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/components/space/demo/Basic.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<IxSpace>
space:
<IxSpace align="center">
Text
<IxButton mode="primary">Button</IxButton>
<IxButton>Button</IxButton>
<IxButton danger>Button</IxButton>
Expand Down
6 changes: 3 additions & 3 deletions packages/components/space/demo/CustomSize.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<IxSpace vertical block>
<IxSlider v-model:value="size" :tooltip-visible="true" :min="0" :max="50"></IxSlider>
<IxSpace :size="size">
space:
<IxSlider v-model:value="size" tooltipVisible :min="0" :max="50"></IxSlider>
<IxSpace :size="size" align="center">
Text
<IxButton mode="primary">Button</IxButton>
<IxButton>Button</IxButton>
</IxSpace>
Expand Down
4 changes: 2 additions & 2 deletions packages/components/space/demo/Size.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<IxRadio value="md">Medium</IxRadio>
<IxRadio value="lg">Large</IxRadio>
</IxRadioGroup>
<IxSpace :size="size">
space:
<IxSpace :size="size" align="center">
Text
<IxButton mode="primary">Button</IxButton>
<IxButton>Button</IxButton>
</IxSpace>
Expand Down
4 changes: 2 additions & 2 deletions packages/components/space/demo/Vertical.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<IxSpace vertical>
space:
<IxSpace vertical justify="center">
Text
<IxButton mode="primary">Button</IxButton>
<IxButton>Button</IxButton>
</IxSpace>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/space/demo/Wrap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<IxSpace :gap="[8, 16]">
<IxSpace :size="[8, 16]">
<IxButton v-for="item in 20" :key="item">Button</IxButton>
</IxSpace>
</template>
4 changes: 2 additions & 2 deletions packages/components/space/docs/Api.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

| 属性 | 说明 | 类型 | 默认值 | 全局配置 | 备注 |
| --- | --- | --- | --- | --- | --- |
| `align` | 垂直对齐方式 | `'start' \| 'center' \| 'end' \| 'baseline' \| 'stretch'` | - | - | - |
| `align` | 垂直对齐方式 | `'start' \| 'center' \| 'end' \| 'baseline' \| 'stretch'` | - | - | 参见[MDN](https://developer.mozilla.org/zh-CN/docs/Web/CSS/align-items) |
| `block` | 将内容宽度调整为自适应其父元素的宽度 | `boolean` | - | - | - |
| `justify` | 水平对齐方式 | `'start' \| 'center' \| 'end' \| 'space-around' \| 'space-between'` | - | - | - |
| `justify` | 水平对齐方式 | `'start' \| 'center' \| 'end' \| 'space-around' \| 'space-between'` | - | - | 参见[MDN](https://developer.mozilla.org/zh-CN/docs/Web/CSS/justify-content) |
| `size` | 间距大小 | `'sm' \| 'md' \| 'lg' \| number \| string \| [number \| string, number \| string]` | `sm` | ✅ | 如果传入一个数组，那么分别表示 `[垂直间距, 水平间距]` |
| `separator` | 设置间隔分割符 | `string \| #separator` | - | - | - |
| `vertical` | 是否为垂直方向 | `boolean` | - | - | - |
Expand Down
4 changes: 2 additions & 2 deletions packages/components/space/src/Space.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ export default defineComponent({
return normalizeClass({
[prefixCls]: true,
[`${prefixCls}-align-${align}`]: align,
[`${prefixCls}-justify-${justify}`]: justify,
[`${prefixCls}-block`]: block,
[`${prefixCls}-vertical`]: vertical,
[`${prefixCls}-justify-${justify}`]: justify,
[`${prefixCls}-nowrap`]: !wrap.value,
[`${prefixCls}-vertical`]: vertical,
})
})

Expand Down
10 changes: 5 additions & 5 deletions packages/components/space/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.@{space-prefix} {
display: inline-flex;
flex-wrap: wrap;
line-height: 1;

&-nowrap {
flex-wrap: nowrap;
Expand All @@ -11,10 +10,7 @@
flex-direction: column;
}

&-block {
width: 100%;
}

&-block,
&-block&-vertical > &-item {
width: 100%;
}
Expand Down Expand Up @@ -62,4 +58,8 @@
justify-content: space-between;
}
}

&-item:empty {
display: none;
}
}
2 changes: 1 addition & 1 deletion packages/site/src/styles/themes/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// auto generated file
@import './seer.less';
@import './default.less';