Skip to content

fix(Grid): fix the border style error when the griditems is not an integer multiple of columns #3740

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
betavs merged 1 commit into from
Jun 25, 2025
Merged

fix(Grid): fix the border style error when the griditems is not an integer multiple of columns #3740

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 src/grid-item/grid-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default class GridItem extends SuperComponent {
// 获取应该加在gridWrap上的padding
getPaddingStyle() {
const { gutter } = this.parent.properties;
if (gutter) return `padding-left:${gutter}rpx;padding-top:${gutter}rpx`;
if (gutter) return `padding-bottom:${gutter}rpx;padding-right:${gutter}rpx`;
return '';
}

Expand All @@ -114,7 +114,7 @@ export default class GridItem extends SuperComponent {
if (!isObject(border)) border = {} as any;
const { color = '#266FE8', width = 2, style = 'solid' } = border as any;
if (gutter) return `border:${width}rpx ${style} ${color}`;
return `border-top:${width}rpx ${style} ${color};border-left:${width}rpx ${style} ${color}`;
return `border-bottom:${width}rpx ${style} ${color};border-right:${width}rpx ${style} ${color}`;
}

onClick(e) {
Expand Down
8 changes: 4 additions & 4 deletions src/grid/__test__/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ describe('grid', () => {
comp.attach(document.createElement('parent-wrapper'));

const $content = comp.querySelector('#grid >>> .t-grid__content');
expect($content.dom.style.marginLeft).toBe('-4px');
expect($content.dom.style.marginRight).toBe('-4px');

comp.setData({ border: true });
expect($content.dom.style.marginLeft).toBe('-2px');
expect($content.dom.style.marginRight).toBe('-2px');

comp.setData({ border: {} });
expect($content.dom.style.marginLeft).toBe('-2px');
expect($content.dom.style.marginRight).toBe('-2px');
});

it(':gutter', () => {
Expand All @@ -42,7 +42,7 @@ describe('grid', () => {
comp.setData({ gutter: 0 });

const $content = comp.querySelector('#grid >>> .t-grid__content');
expect($content.dom.style.marginLeft).toBe('-0px');
expect($content.dom.style.marginRight).toBe('-0px');
});

it(':event', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/grid/grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ export default class Grid extends SuperComponent {
const { gutter } = this.properties;
let { border } = this.properties;

if (!border) return `margin-left:-${gutter}rpx; margin-top:-${gutter}rpx`;
if (!border) return `margin-bottom:-${gutter}rpx; margin-right:-${gutter}rpx`;
if (!isObject(border)) border = {} as any;
const { width = 2 } = border as any;
return `margin-left:-${width}rpx; margin-top:-${width}rpx`;
return `margin-bottom:-${width}rpx; margin-right:-${width}rpx`;
},
};
}
2 changes: 1 addition & 1 deletion src/upload/__test__/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ describe('upload', () => {
const $gridItem = comp.querySelector('#t-upload >>> .t-grid-item');
// gutter = 16, 单位 rpx
expect($gridContent.dom.getAttribute('style')).toEqual(
`margin-left:-${comp.data.gutter}px; margin-top:-${comp.data.gutter}px`,
`margin-bottom:-${comp.data.gutter}px; margin-right:-${comp.data.gutter}px`,
);

// gridConfig: width、 height
Expand Down