Commit 3e309be1 by zhaochengxiang

资产增加排序

parent 496db8e0
...@@ -76,6 +76,6 @@ ...@@ -76,6 +76,6 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "http://192.168.0.111:8189", "proxy": "http://192.168.0.36:8080",
"homepage": "http://myhost/data-govern" "homepage": "http://myhost/data-govern"
} }
...@@ -169,6 +169,7 @@ const AssetTable = (props) => { ...@@ -169,6 +169,7 @@ const AssetTable = (props) => {
const [loadingTemplates, setLoadingTemplates] = useState(false) const [loadingTemplates, setLoadingTemplates] = useState(false)
const [templates, setTemplates] = useState() const [templates, setTemplates] = useState()
const [currentTemplateType, setTemplateType] = useState() const [currentTemplateType, setTemplateType] = useState()
const [sorter, setSorter] = useState()
const [ modal, contextHolder ] = Modal.useModal(); const [ modal, contextHolder ] = Modal.useModal();
const anchorId = getQueryParam(AnchorId, props?.location?.search); const anchorId = getQueryParam(AnchorId, props?.location?.search);
...@@ -278,7 +279,7 @@ const AssetTable = (props) => { ...@@ -278,7 +279,7 @@ const AssetTable = (props) => {
getFilterElementsGroupThenGetDataAssets(); getFilterElementsGroupThenGetDataAssets();
} }
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
}, [ keyword, pagination, elementsChanged, assetActionChanged, recursive, fullSearch ]) }, [ keyword, pagination, elementsChanged, assetActionChanged, recursive, fullSearch, sorter ])
useEffect(() => { useEffect(() => {
if (reference === AssetRecycleReference) { if (reference === AssetRecycleReference) {
...@@ -426,6 +427,7 @@ const AssetTable = (props) => { ...@@ -426,6 +427,7 @@ const AssetTable = (props) => {
dataIndex: `element${index}`, dataIndex: `element${index}`,
ellipsis: true, ellipsis: true,
width: 120, width: 120,
sorter: (reference !== AssetRecycleReference),
render: (text, record) => { render: (text, record) => {
return ( return (
<Tooltip title={text||''}> <Tooltip title={text||''}>
...@@ -505,11 +507,20 @@ const AssetTable = (props) => { ...@@ -505,11 +507,20 @@ const AssetTable = (props) => {
const getDataAssets = (projectIndex = metadataIndexRef.current) => { const getDataAssets = (projectIndex = metadataIndexRef.current) => {
setLoading(true); setLoading(true);
let order = '';
if (sorter?.order === 'ascend') {
order ='asc'
} else if (sorter?.order === 'descend') {
order = 'desc'
}
let params = { let params = {
dirId: nodeId, dirId: nodeId,
pageNum, pageNum,
pageSize, pageSize,
keyword: encodeURIComponent(keyword) keyword: encodeURIComponent(keyword),
orderName: sorter?.column?.title??'',
order: order,
}; };
if (reference !== AssetRecycleReference) { if (reference !== AssetRecycleReference) {
...@@ -1189,6 +1200,12 @@ const AssetTable = (props) => { ...@@ -1189,6 +1200,12 @@ const AssetTable = (props) => {
pagination={false} pagination={false}
size='default' size='default'
scroll={{ y: scrollY }} scroll={{ y: scrollY }}
onChange={(pagination, filters, sorter, extra) => {
if (extra?.action === 'sort') {
console.log('sorter', sorter)
setSorter(sorter)
}
}}
/> />
</ResizeObserver> </ResizeObserver>
......
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