Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

空数据下scroll不启用

This commit is contained in:
wkj 2024-04-08 15:58:02 +08:00
parent e034161748
commit 19b2323c0c
2 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
es/components/list/web.pc.js
View File

@ -105,36 +105,62 @@ export default function Render(props) {
setTableColumns(tableColumns);
}
}, [data, zhCNKeys, schema, tableAttributes]);
return (<Table rowKey="id" rowSelection={rowSelection?.type && {
type: rowSelection?.type,
selectedRowKeys,
onChange: (selectedRowKeys, row, info) => {
rowSelection?.onChange &&
rowSelection?.onChange(selectedRowKeys, row, info);
},
}} size={size} loading={loading} dataSource={data} columns={tableColumns} pagination={tablePagination} locale={locale} scroll={Object.assign({}, showScroll && {
scrollToFirstRowOnChange: true,
x: 1200,
}, scroll)} onRow={(record) => {
return {
onClick: () => {
const index = selectedRowKeys.findIndex((ele) => ele === record.id);
let keys = selectedRowKeys;
if (rowSelection?.type === 'checkbox') {
if (index !== -1) {
keys.splice(index, 1);
return (
<Table
rowKey="id"
rowSelection={
rowSelection?.type && {
type: rowSelection?.type,
selectedRowKeys,
onChange: (selectedRowKeys, row, info) => {
rowSelection?.onChange &&
rowSelection?.onChange(selectedRowKeys, row, info);
},
}
}
size={size}
loading={loading}
dataSource={data}
columns={tableColumns}
pagination={tablePagination}
locale={locale}
scroll={
data?.length > 0 ?
Object.assign(
{},
showScroll &&
{
scrollToFirstRowOnChange: true,
x: 1200,
},
scroll
) : undefined
}
onRow={(record) => {
return {
onClick: () => {
const index = selectedRowKeys.findIndex(
(ele) => ele === record.id
);
let keys = selectedRowKeys;
if (rowSelection?.type === 'checkbox') {
if (index !== -1) {
keys.splice(index, 1);
} else {
keys.push(record.id);
}
} else {
keys = [record.id];
}
else {
keys.push(record.id);
}
}
else {
keys = [record.id];
}
const row = data.filter((ele) => keys.includes(ele.id));
rowSelection?.onChange &&
rowSelection?.onChange(keys, row, { type: 'all' });
},
};
}} showHeader={!hideHeader}></Table>);
const row = data?.filter((ele) =>
keys.includes(ele.id)
);
rowSelection?.onChange &&
rowSelection?.onChange(keys, row, { type: 'all' });
},
};
}}
showHeader={!hideHeader}
></Table>
);
}

5
src/components/list/web.pc.tsx
View File

@ -186,7 +186,6 @@ export default function Render(
const oakActions = row?.[
'#oakLegalActions'
] as string[];
// assert(!!oakActions, '行数据中不存在#oakLegalActions, 请禁用(disableOp:true)或添加actions')
let extraActions2: OakExtraActionProps[];
if (typeof extraActions === 'function') {
extraActions2 = extraActions(row);
@ -235,14 +234,14 @@ export default function Render(
columns={tableColumns}
pagination={tablePagination}
locale={locale}
scroll={Object.assign(
scroll={data?.length > 0 ? Object.assign(
{},
showScroll && {
scrollToFirstRowOnChange: true,
x: 1200,
},
scroll
)}
) : undefined}
onRow={(record) => {
return {
onClick: () => {