Commit 09185618 authored by 陈龙's avatar 陈龙

fix: 修复表格部分报错

parent 9f40688e
...@@ -1101,7 +1101,7 @@ const HistoryView = (props) => { ...@@ -1101,7 +1101,7 @@ const HistoryView = (props) => {
let zoomParam = let zoomParam =
activeTabKey === 'curve' activeTabKey === 'curve'
? handleDataThinKey(diffYears, diffDays, diffHours, lineDataType) ? handleDataThinKey(diffYears, diffDays, diffHours, lineDataType)
: (!isDilute?{zoom:'',unit:''}:{});// 表格也支持全数据模式; : (!isDilute ? {zoom: '', unit: ''} : {});// 表格也支持全数据模式;
requestArr.push(getHistoryInfo({...param, ...zoomParam})); requestArr.push(getHistoryInfo({...param, ...zoomParam}));
}); });
...@@ -1206,7 +1206,10 @@ const HistoryView = (props) => { ...@@ -1206,7 +1206,10 @@ const HistoryView = (props) => {
pagination={false} pagination={false}
onChange={handleChange} onChange={handleChange}
// scroll={{ x: 'max-content', y: 'calc(100% - 40px)' }} // scroll={{ x: 'max-content', y: 'calc(100% - 40px)' }}
scroll={{x: 'max-content', y: tableRef.current.getBoundingClientRect().height - 40}} scroll={{
x: 'max-content',
y: tableRef.current ? tableRef.current.getBoundingClientRect().height - 40 : 0
}}
/> />
) : ( ) : (
<PandaEmpty/> <PandaEmpty/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment