采集

src/view/Manage/MetadataHarvester/Component/Task.jsx

@@ -426,12 +426,12 @@ const FC = (props) => {
         dataSource={_tasks||[]}
         pagination={false} 
         onChange={onTableChange}
-        scroll={{ y: 'calc(100vh - 320px)' }}
+        scroll={{ y: 'calc(100vh - 325px)' }}
         sticky
       />
       <Pagination
         size="small"
-        className="text-center mt-3"
+        className="text-center mt-3 mb-1"
         showSizeChanger
         showQuickJumper
         onChange={onPaginationChange}

src/view/Manage/MetadataHarvester/Component/TaskReport.jsx

@@ -331,6 +331,7 @@ const FC = (props) => {
         columns={columns||[]} 
         rowKey='taskStateId'
         dataSource={tableData||[]}
+        extraColWidth={48}
         expandable={{
           onExpand: (expanded, record) => {
             if (expanded) {
@@ -376,12 +377,12 @@ const FC = (props) => {
           },
         }}
         pagination={false} 
-        scroll={{ y: 'calc(100vh - 400px)' }}
+        scroll={{ y: 'calc(100vh - 410px)' }}
         sticky
       />
       <Pagination
         size="small"
-        className="text-center mt-3"
+        className="text-center mt-3 mb-1"
         showSizeChanger
         showQuickJumper
         onChange={onPaginationChange}

src/view/Manage/MetadataHarvester/index.less

 .metadata-harvester {
-  height: calc(100vh - 64px - 30px);
-  padding: 20px;
+  height: calc(100vh - 124px);
+  padding: 10px;
   background: #fff;
   overflow: auto;
 }
\ No newline at end of file

src/view/Manage/ResizeableTable/index.jsx

@@ -36,7 +36,7 @@ const ResizeableHeaderCell = props => {
 };
 
 const ResizeableTable = (props) => {
-  const { columns, ...restProps } = props
+  const { columns, extraColWidth = 0, ...restProps } = props
 
   const [tableWidth, setTableWidth] = useState(0)
 
@@ -61,7 +61,7 @@ const ResizeableTable = (props) => {
 
   useEffect(() => {
     if (!!columns && tableWidth > 0) {
-      const contentWidth = getWidth(tableWidth)
+      const contentWidth = getWidth(tableWidth, extraColWidth)
       setDefaultWidth(columns, contentWidth)
       paddingCol.current.width = 0
 
@@ -105,9 +105,8 @@ const ResizeableTable = (props) => {
 
 export default ResizeableTable;
 
-function getWidth(tableWidth) {
-  // FIXME 判断没有选择列时,32为0
-  return tableWidth - scrollbarWidth - 32 // scrollbar width, checkbox column
+function getWidth(tableWidth, extraColWidth) {
+  return tableWidth - scrollbarWidth - extraColWidth 
 }
 
 function setDefaultWidth(columns, width) {