Skip to content

Commit

Permalink
feat(comp:table): scroll support fullHeight (#739)
Browse files Browse the repository at this point in the history
* feat(comp:table): scroll support fullHeight

BREAKING CHANGE: `scroll.x` and `scroll.y` are deprecated, please use `scroll.width` and
`scroll.height` instead

* test(comp:table): add basic test
  • Loading branch information
danranVm committed Jan 24, 2022
1 parent 9cda3d0 commit 2255853
Show file tree
Hide file tree
Showing 27 changed files with 775 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keyframes-name-pattern": null,
"at-rule-no-unknown": null,
"function-name-case": ["lower", { "ignoreFunctions": ["/colorPalette/"] }],
"rule-empty-line-before": ["always"],
"rule-empty-line-before": null,
"no-invalid-double-slash-comments": null,
"no-invalid-position-at-import-rule": null,
"font-family-no-missing-generic-family-keyword": null
Expand Down
2 changes: 1 addition & 1 deletion packages/components/_private/empty/src/Empty.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const Empty: FunctionalComponent<EmptyProps> = (props, { slots }) => {
}

const { empty } = props
const emptyProps = isString(empty) ? { description: empty } : { ...empty }
const emptyProps = isString(empty) ? { description: empty } : empty

return <IxEmpty {...emptyProps}></IxEmpty>
}
Expand Down
3 changes: 1 addition & 2 deletions packages/components/button/style/mixin.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

.button-disabled(@color: @button-disable-color; @background: @button-disable-bg-color; @border: @button-disable-border) {
&.@{button-prefix}-disabled {

&,
&:hover,
&:focus,
Expand Down Expand Up @@ -105,7 +104,7 @@
border-color: @border;

> a:only-child {
color: currentColor;
color: currentcolor;

&::after {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/empty/src/Empty.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default defineComponent({

return () => {
const prefixCls = mergedPrefixCls.value
const descriptionNode = slots.description?.() ?? description.value
const descriptionNode = slots.description ? slots.description() : description.value
return (
<div class={prefixCls}>
<div class={`${prefixCls}-image`}>{renderImage(props, slots, config)}</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/components/icon/src/definitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ export const ExclamationCircle = {

export const Expand = {
name: 'expand',
svg: '<svg viewBox="64 64 896 896" focusable="false"><path d="M1018.645 531.298c8.635-18.61 4.601-41.42-11.442-55.864l-205.108-184.68c-19.7-17.739-50.05-16.148-67.789 3.552-17.738 19.7-16.148 50.051 3.553 67.79l166.28 149.718-167.28 150.62c-19.7 17.738-21.291 48.088-3.553 67.789 17.739 19.7 48.089 21.291 67.79 3.553l205.107-184.68a47.805 47.805 0 0 0 12.442-17.798zM119.947 511.39l166.28-149.719c19.7-17.738 21.29-48.088 3.552-67.789-17.738-19.7-48.088-21.291-67.789-3.553L16.882 475.01C.84 489.456-3.194 512.264 5.44 530.874a47.805 47.805 0 0 0 12.442 17.798l205.108 184.68c19.7 17.739 50.05 16.148 67.79-3.552 17.738-19.7 16.147-50.051-3.553-67.79l-167.28-150.62z"/></svg>',
svg: '<svg viewBox="64 64 896 896" focusable="false"><path d="M308.288 285.248a15.64 15.64 0 0 1 11.264 4.8L344 314.496a15.68 15.68 0 0 1 0 22.528L151.552 529.536 344 721.984a15.68 15.68 0 0 1 2.56 19.264l-2.56 3.2-24.448 24.512a15.68 15.68 0 0 1-22.528 0L68.8 540.8a15.68 15.68 0 0 1 0-22.592l228.16-228.16a15.68 15.68 0 0 1 11.264-4.8zm407.424 0c4.288 0 8.32 1.664 11.264 4.736L955.2 518.208a15.68 15.68 0 0 1 2.56 19.2l-2.56 3.392-228.224 228.16a15.68 15.68 0 0 1-22.528 0L680 744.512a15.68 15.68 0 0 1 0-22.528l192.448-192.512L680 337.024a15.68 15.68 0 0 1 0-22.528l24.448-24.512a15.68 15.68 0 0 1 11.264-4.8z"/></svg>',
}

export const Export = {
Expand Down Expand Up @@ -892,7 +892,7 @@ export const TreeUnexpand = {

export const Unexpand = {
name: 'unexpand',
svg: '<svg viewBox="64 64 896 896" focusable="false"><path d="M1018.645 531.298c8.635-18.61 4.601-41.42-11.442-55.864l-205.108-184.68c-19.7-17.739-50.05-16.148-67.789 3.552-17.738 19.7-16.148 50.051 3.553 67.79l166.28 149.718-167.28 150.62c-19.7 17.738-21.291 48.088-3.553 67.789 17.739 19.7 48.089 21.291 67.79 3.553l205.107-184.68a47.805 47.805 0 0 0 12.442-17.798zM119.947 511.39l166.28-149.719c19.7-17.738 21.29-48.088 3.552-67.789-17.738-19.7-48.088-21.291-67.789-3.553L16.882 475.01C.84 489.456-3.194 512.264 5.44 530.874a47.805 47.805 0 0 0 12.442 17.798l205.108 184.68c19.7 17.739 50.05 16.148 67.79-3.552 17.738-19.7 16.147-50.051-3.553-67.79l-167.28-150.62zm529.545-377.146c24.911 9.066 37.755 36.61 28.688 61.522L436.03 861.068c-9.067 24.911-36.611 37.755-61.522 28.688-24.911-9.066-37.755-36.61-28.688-61.522l242.15-665.302c9.067-24.911 36.611-37.755 61.522-28.688z"/></svg>',
svg: '<svg viewBox="64 64 896 896" focusable="false"><path d="m344 744.512-24.448 24.448a15.68 15.68 0 0 1-22.528 0L68.8 540.8a15.68 15.68 0 0 1 0-22.592l228.16-228.16a15.68 15.68 0 0 1 22.528 0l24.448 24.448a15.68 15.68 0 0 1 0 22.528L151.552 529.536 344 721.984a15.68 15.68 0 0 1 0 22.528zm289.472-522.56-182.72 632.256a15.552 15.552 0 0 1-19.072 10.752l-30.4-8.32a15.872 15.872 0 0 1-10.752-19.584L573.184 204.8a15.552 15.552 0 0 1 19.072-10.752l30.4 8.32c8.32 2.496 13.184 11.264 10.816 19.648zM955.2 540.8 726.976 768.96a15.68 15.68 0 0 1-22.528 0L680 744.512a15.68 15.68 0 0 1 0-22.528l192.448-192.512L680 337.024a15.68 15.68 0 0 1 0-22.528l24.448-24.512a15.68 15.68 0 0 1 22.528 0L955.2 518.208a15.68 15.68 0 0 1 0 22.528z"/></svg>',
}

export const Unlock = {
Expand Down
3 changes: 1 addition & 2 deletions packages/components/icon/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
> svg {
width: 1em;
height: 1em;
fill: currentColor;
fill: currentcolor;
}

&-loading,
Expand All @@ -24,7 +24,6 @@
}

@keyframes icon-spinning {

100% {
transform: rotate(360deg);
}
Expand Down

0 comments on commit 2255853

Please sign in to comment.