Commit54cf4db

committed

fix styles for sortable column header

1 parent951b904 commit54cf4dbCopy full SHA for 54cf4db

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export const columnChildrenMap = {`
`106`	`106`	`borderWidth:withDefault(RadiusControl,""),`
`107`	`107`	`radius:withDefault(RadiusControl,""),`
`108`	`108`	`textSize:withDefault(RadiusControl,""),`
`109`		`-textWeight:withDefault(StringControl,"regular"),`
	`109`	`+textWeight:withDefault(StringControl,"normal"),`
`110`	`110`	`fontFamily:withDefault(StringControl,"sans-serif"),`
`111`	`111`	`cellColor:CellColorComp,`
`112`	`112`	`textOverflow:withDefault(TextOverflowControl,"ellipsis"),`
`@@ -276,7 +276,7 @@ export class ColumnComp extends ColumnInitComp {`
`276`	`276`	`{this.children.textWeight.propertyView({`
`277`	`277`	`label:trans('style.textWeight'),`
`278`	`278`	`preInputNode:<StyledTextWeightIconas={TextWeigthIcon}title=""/>,`
`279`		`-placeholder:'regular',`
	`279`	`+placeholder:'normal',`
`280`	`280`	`})}`
`281`	`281`	`{this.children.fontFamily.propertyView({`
`282`	`282`	`label:trans('style.fontFamily'),`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,6 @@ const TableWrapper = styled.div<{`
`212`	`212`	`border-color:${(props)=>props.$headerStyle.border};`
`213`	`213`	`border-width:${(props)=>props.$headerStyle.borderWidth};`
`214`	`214`	`color:${(props)=>props.$headerStyle.headerText};`
`215`		`- font-size:${(props)=>props.$headerStyle.textSize};`
`216`		`- font-weight:${(props)=>props.$headerStyle.textWeight};`
`217`		`- font-family:${(props)=>props.$headerStyle.fontFamily};`
`218`	`215`	border-inline-end:${(props)=>`${props.$headerStyle.borderWidth} solid${props.$headerStyle.border}`} !important;
`219`	`216`	`${(props)=>`
`220`	`217`	props.$fixedHeader&&`
`@@ -227,6 +224,12 @@ const TableWrapper = styled.div<{`
`227`	`224`
`228`	`225`	`> div {`
`229`	`226`	`margin:${(props)=>props.$headerStyle.margin};`
	`227`	`+`
	`228`	`+ &, .ant-table-column-title > div {`
	`229`	`+ font-size:${(props)=>props.$headerStyle.textSize};`
	`230`	`+ font-weight:${(props)=>props.$headerStyle.textWeight};`
	`231`	`+ font-family:${(props)=>props.$headerStyle.fontFamily};`
	`232`	`+ }`
`230`	`233`	`}`
`231`	`234`
`232`	`235`	`&:last-child {`
`@@ -516,7 +519,7 @@ function TableCellView(props: {`
`516`	`519`	`constcellColor=cellColorFn({`
`517`	`520`	`currentCell:record[title.toLowerCase()],`
`518`	`521`	`});`
`519`		`-`
	`522`	`+`
`520`	`523`	`conststyle={`
`521`	`524`	`background:cellColor\|\|rowColor\|\|columnStyle.background\|\|columnsStyle.background,`
`522`	`525`	`margin:columnStyle.margin\|\|columnsStyle.margin,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ function calcColors<ColorMap extends Record<string, string>>(`
`393`	`393`	`}`
`394`	`394`	`if(isTextWeightConfig(config)){`
`395`	`395`	`// TODO: remove default textWeight after added in theme in backend.`
`396`		`-res[name]=themeWithDefault[config.textWeight]\|\|'regular';`
	`396`	`+res[name]=themeWithDefault[config.textWeight]\|\|'normal';`
`397`	`397`	`}`
`398`	`398`	`if(isFontFamilyConfig(config)){`
`399`	`399`	`res[name]=themeWithDefault[config.fontFamily]\|\|'sans-serif';`

Comments

(0)