Skip to content

feat: add heightAsTableHeight prop #75

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: add heightAsTableHeight prop #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae6cae
feat: add heightAsTableHeight prop
JiaweiUTSCHINA Sep 15, 2022
19229ff
fix: fix heightAsTableHeight scrollY height calculation
JiaweiUTSCHINA Sep 15, 2022
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
15 changes: 13 additions & 2 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function VTable(props: any, otherParams): JSX.Element {
const { style, children, ...rest } = props
const { width, ...rest_style } = style

const { vid, scrollY, reachEnd, onScroll, resetScrollTopWhenDataChange } =
const { vid, scrollY, heightAsTableHeight, reachEnd, onScroll, resetScrollTopWhenDataChange } =
otherParams ?? {}

const [state, dispatch] = useReducer(reducer, initialState)
Expand Down Expand Up @@ -234,6 +234,13 @@ function VTable(props: any, otherParams): JSX.Element {
return temp
}, [state.rowHeight, totalLen])

const realHeight = useMemo<string | number>(() => {
if (heightAsTableHeight && typeof tableHeight === 'number' && typeof scrollY === 'number') {
return Math.max(scrollY - 10, tableHeight);
}
return tableHeight;
}, [heightAsTableHeight, scrollY, tableHeight]);

// table的scrollY值
const [tableScrollY, setTableScrollY] = useState(0)

Expand Down Expand Up @@ -373,7 +380,7 @@ function VTable(props: any, otherParams): JSX.Element {
style={{
width: '100%',
position: 'relative',
height: tableHeight,
height: realHeight,
boxSizing: 'border-box',
paddingTop: state.curScrollTop,
}}
Expand Down Expand Up @@ -409,6 +416,8 @@ function VTable(props: any, otherParams): JSX.Element {
// ================导出===================
export function VList(props: {
height: number | string
// 是否需要将tableHeight和height的最大值作为table的body高度使用(仅height为数字时才生效)
heightAsTableHeight?: boolean;
// 到底的回调函数
onReachEnd?: () => void
onScroll?: () => void
Expand All @@ -429,6 +438,7 @@ export function VList(props: {
const {
vid = DEFAULT_VID,
height,
heightAsTableHeight = false,
onReachEnd,
onScroll,
onListRender,
Expand All @@ -455,6 +465,7 @@ export function VList(props: {
VTable(p, {
vid,
scrollY: height,
heightAsTableHeight,
reachEnd: onReachEnd,
onScroll,
onListRender,
Expand Down