diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx index 7911c889b..bc3770169 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx @@ -69,8 +69,8 @@ const getStyle = ( &, > td { background: ${genLinerGradient(rowStyle.background)}; - border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; - border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; + // border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; + // border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; } } @@ -78,8 +78,8 @@ const getStyle = ( &, > td { background: ${alternateBackground}; - border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; - border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; + // border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; + // border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important; } } @@ -192,11 +192,14 @@ const TableWrapper = styled.div<{ } .ant-table { - background: ${(props) => props.$style.background}; + overflow-y:scroll; + background: ${(props) =>props.$style.background}; .ant-table-container { border-left: unset; border-top: none !important; border-inline-start: none !important; + overflow-y:scroll; + height:300px; &::after { box-shadow: none !important; @@ -221,7 +224,7 @@ const TableWrapper = styled.div<{ border-color: ${(props) => props.$headerStyle.border}; border-width: ${(props) => props.$headerStyle.borderWidth}; color: ${(props) => props.$headerStyle.headerText}; - border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important; + // border-inline-end: ${(props) => `${props.$headerStyle.borderWidth} solid ${props.$headerStyle.border}`} !important; ${(props) => props.$fixedHeader && ` position: sticky; @@ -269,6 +272,7 @@ const TableWrapper = styled.div<{ td { padding: 0px 0px; + // ${(props) => props.$showHRowGridBorder ?'border-bottom: 1px solid #D7D9E0 !important;': `border-bottom: 0px;`} } thead > tr:first-child { @@ -278,7 +282,7 @@ const TableWrapper = styled.div<{ } tbody > tr > td:last-child { - border-right: unset; + border-right: unset !important; } .ant-empty-img-simple-g { diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx index bc59934db..987f8b1ee 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx @@ -192,8 +192,8 @@ export type RowHeightViewType = (param: { const tableChildrenMap = { // hideBordered: BoolControl, showHeaderGridBorder: BoolControl, - showRowGridBorder: BoolControl, - showHRowGridBorder: BoolControl, + showRowGridBorder: withDefault(BoolControl,true), + showHRowGridBorder: withDefault(BoolControl,true), hideHeader: BoolControl, fixedHeader: BoolControl, autoHeight: withDefault(AutoHeightControl, "auto"),