Commit f600b71f by zhaochengxiang

采集

parent fe5436ea
...@@ -7,10 +7,10 @@ import { paginate, showMessage } from '../../../../util'; ...@@ -7,10 +7,10 @@ import { paginate, showMessage } from '../../../../util';
import Table from '../../ResizeableTable'; import Table from '../../ResizeableTable';
import UpdateTask from './UpdateTask'; import UpdateTask from './UpdateTask';
import ColConfig, { menuName } from './ColConfig'; import ColConfig, { menuName } from './ColConfig';
import env from '../../../../service/samples/env.json'; // import env from '../../../../service/samples/env.json';
const FC = (props) => { const FC = (props) => {
// const { env } = useContext(AppContext); const { env } = useContext(AppContext);
const [loadingTasks, setLoadingTasks] = useState(false); const [loadingTasks, setLoadingTasks] = useState(false);
const [tasks, setTasks] = useState(undefined); const [tasks, setTasks] = useState(undefined);
const [pagination, setPagination] = useState({pageNum: 1, pageSize: 20}); const [pagination, setPagination] = useState({pageNum: 1, pageSize: 20});
...@@ -426,11 +426,12 @@ const FC = (props) => { ...@@ -426,11 +426,12 @@ const FC = (props) => {
dataSource={_tasks||[]} dataSource={_tasks||[]}
pagination={false} pagination={false}
onChange={onTableChange} onChange={onTableChange}
scroll={{ y: 'calc(100vh - 320px)' }}
sticky sticky
/> />
<Pagination <Pagination
size="small" size="small"
className="text-center m-3" className="text-center mt-3"
showSizeChanger showSizeChanger
showQuickJumper showQuickJumper
onChange={onPaginationChange} onChange={onPaginationChange}
...@@ -481,7 +482,7 @@ export const reducer = (prevState, action) => { ...@@ -481,7 +482,7 @@ export const reducer = (prevState, action) => {
} }
export function Config({ onState, autoSelect, setTargetTypes }) { export function Config({ onState, autoSelect, setTargetTypes }) {
// const { env } = useContext(AppContext); const { env } = useContext(AppContext);
const [treeData, setTreeData] = useState([]); const [treeData, setTreeData] = useState([]);
const [treeExpandKeys, setTreeExpandKeys] = useState([]); const [treeExpandKeys, setTreeExpandKeys] = useState([]);
const [loadingSupportedTargetTypes, setLoadingSupportedTargetTypes] = useState(false); const [loadingSupportedTargetTypes, setLoadingSupportedTargetTypes] = useState(false);
......
import React, { useState, useEffect, useContext, useMemo } from 'react'; import React, { useState, useEffect, useContext, useMemo } from 'react';
import { Space, DatePicker, Row, Col, Card, Spin, Empty, Typography, Pagination, Input, Select } from 'antd'; import { Space, DatePicker, Row, Col, Card, Spin, Empty, Typography, Pagination, Input, Select, Tooltip } from 'antd';
import 'moment/locale/zh-cn'; import 'moment/locale/zh-cn';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
...@@ -7,7 +7,7 @@ import { AppContext } from '../../../../App'; ...@@ -7,7 +7,7 @@ import { AppContext } from '../../../../App';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
import { paginate } from '../../../../util'; import { paginate } from '../../../../util';
import Table from '../../ResizeableTable'; import Table from '../../ResizeableTable';
import env from '../../../../service/samples/env.json'; // import env from '../../../../service/samples/env.json';
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const { Meta } = Card; const { Meta } = Card;
...@@ -25,7 +25,7 @@ const reportStates = [ ...@@ -25,7 +25,7 @@ const reportStates = [
] ]
const FC = (props) => { const FC = (props) => {
// const { env } = useContext(AppContext); const { env } = useContext(AppContext);
const [rangeValue, setRangeValue] = useState(undefined); const [rangeValue, setRangeValue] = useState(undefined);
const [summaryData, setSummaryData] = useState(undefined); const [summaryData, setSummaryData] = useState(undefined);
const [reportData, setReportData] = useState(undefined); const [reportData, setReportData] = useState(undefined);
...@@ -54,6 +54,13 @@ const FC = (props) => { ...@@ -54,6 +54,13 @@ const FC = (props) => {
item.title = item.value||''; item.title = item.value||'';
item.dataIndex = item.name||''; item.dataIndex = item.name||'';
item.ellipsis = true; item.ellipsis = true;
item.render = (text, record) => {
return (
<Tooltip title={text||''}>
<Typography.Text ellipsis={true}>{text||''}</Typography.Text>
</Tooltip>
);
}
}); });
newColumns = [{ newColumns = [{
...@@ -369,11 +376,12 @@ const FC = (props) => { ...@@ -369,11 +376,12 @@ const FC = (props) => {
}, },
}} }}
pagination={false} pagination={false}
scroll={{ y: 'calc(100vh - 400px)' }}
sticky sticky
/> />
<Pagination <Pagination
size="small" size="small"
className="text-center m-3" className="text-center mt-3"
showSizeChanger showSizeChanger
showQuickJumper showQuickJumper
onChange={onPaginationChange} onChange={onPaginationChange}
......
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