Skip to content

Commit

Permalink
generate function a little change
Browse files Browse the repository at this point in the history
  • Loading branch information
wangjinpeng1235 committed Aug 27, 2024
1 parent a11f2a5 commit b033dae
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/props/kernelProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ export type SimpleCommonColumnProps = ChangeOptionalExcept<CommonColumnProps, 'n
*/
function generateCommonColumnProps(tableSimple: SimpleCommonColumnProps, layoutSimple?: SimpleCommonColumnProps): CommonColumnProps {
return {
name: layoutSimple?.name ?? tableSimple.name,
wrap: layoutSimple?.wrap ?? tableSimple.wrap ?? false,
fixed: layoutSimple?.fixed ?? tableSimple.fixed ?? false,
width: layoutSimple?.width ?? tableSimple.width ?? 100,
hide: layoutSimple?.hide ?? tableSimple.hide ?? false,
styles: layoutSimple?.styles ?? tableSimple.styles ?? {},
categoryTitle: layoutSimple?.categoryTitle ?? tableSimple.categoryTitle,
render: layoutSimple?.render ?? tableSimple.render,
name: layoutSimple?.name ?? tableSimple?.name,
wrap: layoutSimple?.wrap ?? tableSimple?.wrap ?? false,
fixed: layoutSimple?.fixed ?? tableSimple?.fixed ?? false,
width: layoutSimple?.width ?? tableSimple?.width ?? 100,
hide: layoutSimple?.hide ?? tableSimple?.hide ?? false,
styles: layoutSimple?.styles ?? tableSimple?.styles ?? {},
categoryTitle: layoutSimple?.categoryTitle ?? tableSimple?.categoryTitle,
render: layoutSimple?.render ?? tableSimple?.render,
}
}

Expand Down

0 comments on commit b033dae

Please sign in to comment.