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.

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

fix(comp:button, card, pagination, pro:tree): style update #1275

Merged
merged 1 commit into from
Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from all 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 packages/components/button/__tests__/button.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ describe('Button', () => {
await wrapper.setProps({ mode: 'link' })

expect(wrapper.classes()).toContain('ix-button-link')
expect(wrapper.element.tagName).toEqual('BUTTON')

await wrapper.setProps({ href: '#' })
expect(wrapper.element.tagName).toEqual('A')
})

Expand Down
7 changes: 5 additions & 2 deletions packages/components/button/src/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ import { IxIcon } from '@idux/components/icon'
import { buttonToken } from './token'
import { buttonProps } from './types'

const aProps = ['href', 'target', 'rel', 'download', 'hreflang', 'ping']

export default defineComponent({
name: 'IxButton',
props: buttonProps,
setup(props, { slots }) {
setup(props, { slots, attrs }) {
const common = useGlobalConfig('common')
const mergedPrefixCls = computed(() => `${common.prefixCls}-button`)
const config = useGlobalConfig('button')
Expand Down Expand Up @@ -69,7 +71,8 @@ export default defineComponent({
children.push(<span>{slots.default()}</span>)
}

if (mode.value === 'link') {
// 只有在 mode = 'link' 且设置了相关的 attrs 时,才渲染成 a 标签
if (mode.value === 'link' && Object.keys(attrs).some(attr => aProps.includes(attr))) {
return (
<a class={classes.value} onClick={handleClick}>
{children}
Expand Down
7 changes: 6 additions & 1 deletion packages/components/button/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
&-link {
background-color: transparent;
border-color: transparent;
padding: 0;

&:focus,
&:hover {
Expand All @@ -128,6 +129,10 @@
}
}

&-link {
color: @button-primary-background-color;
}

&-danger {
color: @button-danger-color;
border-color: @button-danger-color;
Expand Down Expand Up @@ -256,7 +261,7 @@
&:hover,
&:focus,
&:active {
background-color: @button-background-color;
background-color: transparent;
border-color: transparent;
}
}
Expand Down
12 changes: 2 additions & 10 deletions packages/components/card/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,6 @@
border: @card-border-width @card-border-style @color-primary;
}
}

.@{idux-prefix}-header {
&-content {
> .@{idux-prefix}-header-suffix {
padding: 0;
}
}
}
}

@keyframes card-loading {
Expand All @@ -213,7 +205,7 @@
font-size: @font-size;
line-height: calc(@font-size + var(--ix-line-height-gutter));

> .@{idux-prefix}-header {
> .@{header-prefix} {
padding-left: @card-padding;
padding-right: @card-padding;
}
Expand All @@ -226,7 +218,7 @@
padding: @card-padding;
}

.@{idux-prefix}-header + .@{card-prefix}-body {
.@{header-prefix} + .@{card-prefix}-body {
padding-top: 4px;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/components/pagination/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
list-style: none;
outline: none;
user-select: none;
background-color: @pagination-background-color;

&-sm {
.pagination-size(@pagination-font-size-sm, @pagination-item-padding-sm, @pagination-item-content-size-sm);
Expand Down Expand Up @@ -74,6 +73,7 @@

&-item {
cursor: pointer;
line-height: 1;
transition: color var(--ix-transition-duration-fast);

&-content {
Expand Down
4 changes: 3 additions & 1 deletion packages/pro/table/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
min-width: 240px;
}

.@{header-prefix},
&-search-wrapper,
&-select-wrapper,
&-tree-wrapper {
padding: 0 @spacing-sm;
}

.@{header-prefix} {
padding-left: @spacing-sm;
padding-right: @spacing-sm;

&-title {
color: @text-color;
font-weight: @font-weight-md;
Expand Down
9 changes: 2 additions & 7 deletions packages/pro/tree/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
flex-direction: column;
overflow: hidden;
transition: width @transition-duration-base;

&-header-wrapper,
&-search-wrapper {
display: flex;
Expand All @@ -29,6 +29,7 @@
&-header-wrapper {
.@{icon-prefix} {
font-size: @pro-tree-header-wrapper-icon-font-size;
line-height: calc(@pro-tree-header-wrapper-icon-font-size + var(--ix-line-height-gutter));
flex: auto;
cursor: pointer;
display: inline-block;
Expand All @@ -39,12 +40,6 @@
}
}

.@{icon-prefix},
.@{header-prefix}-content {
height: @pro-tree-header-wrapper-height;
line-height: @pro-tree-header-wrapper-height;
}

& + .@{divider-prefix} {
margin: @pro-tree-divider-vertical-spacing @pro-tree-divider-horizontal-spacing;
width: calc(100% - @pro-tree-divider-horizontal-spacing * 2);
Expand Down