Commit 97b3a7b6 by zhaochengxiang

资源管理详情

parent bc33f5c4
...@@ -132,7 +132,7 @@ function FC<RowType extends object = any>({ width, maxHeight, pageSize, pageNum, ...@@ -132,7 +132,7 @@ function FC<RowType extends object = any>({ width, maxHeight, pageSize, pageNum,
onRow={(record, index) => { onRow={(record, index) => {
return { return {
onClick: event => { onClick: event => {
onRowClick?.(event,record) onRowClick?.(event, record)
}, },
onContextMenu: event => { onContextMenu: event => {
setRightClickNode(record) setRightClickNode(record)
......
import React from "react" import React from "react"
import classNames from 'classnames' import classNames from 'classnames'
import { ResizableBox } from 'react-resizable' import { ResizableBox } from 'react-resizable'
import { Form } from "antd"
import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons' import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons'
import Tree from './tree' import Tree from './tree'
import Separate from '../AssetManage/Component/Separate' import Separate from '../AssetManage/Component/Separate'
import NodeDetail from '../AssetManage/Component/AssetDirectory' import NodeDetail from '../AssetManage/Component/AssetDirectory'
import ResourceList from './table' import ResourceList from './table'
import AssetDetail from '../AssetManage/Component/AssetAction'
import '../AssetManage/index.less' import '../AssetManage/index.less'
import { ResourceManageReference } from "../../../util/constant" import { ResourceManageReference } from "../../../util/constant"
...@@ -14,12 +16,20 @@ import { ResourceManageReference } from "../../../util/constant" ...@@ -14,12 +16,20 @@ import { ResourceManageReference } from "../../../util/constant"
const FC = (props) => { const FC = (props) => {
const [collapseTree, setCollapseTree] = React.useState(false) const [collapseTree, setCollapseTree] = React.useState(false)
const [node, setNode] = React.useState() const [node, setNode] = React.useState()
const [asset, setAsset] = React.useState()
const [assetListFullScreen, setAssetListFullScreen] = React.useState(false) const [assetListFullScreen, setAssetListFullScreen] = React.useState(false)
const [form] = Form.useForm()
const onTreeClick = (value) => { const onTreeClick = (value) => {
setNode(value) setNode(value)
} }
const onResourceListClick = (value) => {
console.log('value', value)
setAsset(value)
}
const treeToggleClick = () => { const treeToggleClick = () => {
setCollapseTree(!collapseTree) setCollapseTree(!collapseTree)
} }
...@@ -50,14 +60,20 @@ const FC = (props) => { ...@@ -50,14 +60,20 @@ const FC = (props) => {
<div className={middleClasses}> <div className={middleClasses}>
<NodeDetail reference={ResourceManageReference} id={node?.nodeId} assetCount={node?.dataAssetAndSubDirCount}/> <NodeDetail reference={ResourceManageReference} id={node?.nodeId} assetCount={node?.dataAssetAndSubDirCount}/>
<Separate height={15} /> <Separate height={15} />
<ResourceList node={node} /> <ResourceList node={node} onClick={onResourceListClick} />
<div className='tree-toggle' onClick={treeToggleClick}> <div className='tree-toggle' onClick={treeToggleClick}>
{ !collapseTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> } { !collapseTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
</div> </div>
</div> </div>
<Separate width='15px' /> <Separate width='15px' />
<div className='right'> <div className='right'>
<AssetDetail
form={form}
id={asset?.id}
dirId={node?.nodeId}
action='detail'
reference={ResourceManageReference}
/>
</div> </div>
</div> </div>
) )
......
...@@ -7,7 +7,7 @@ import { dispatch } from '../../../model' ...@@ -7,7 +7,7 @@ import { dispatch } from '../../../model'
import { isSzseEnv } from '../../../util' import { isSzseEnv } from '../../../util'
const FC = (props) => { const FC = (props) => {
const { node } = props const { node, onClick } = props
const [args, setArgs] = React.useState(() => ({ const [args, setArgs] = React.useState(() => ({
params: { params: {
page: defaultPage.pageNum, page: defaultPage.pageNum,
...@@ -25,6 +25,7 @@ const FC = (props) => { ...@@ -25,6 +25,7 @@ const FC = (props) => {
const [data, setData] = React.useState() const [data, setData] = React.useState()
const [total, setTotal] = React.useState() const [total, setTotal] = React.useState()
const [selectedRows, setSelectedRows] = React.useState([]) const [selectedRows, setSelectedRows] = React.useState([])
const [row, setRow] = React.useState()
const [page, setPage] = usePage() const [page, setPage] = usePage()
const setArgsAndPage = React.useCallback((params) => { const setArgsAndPage = React.useCallback((params) => {
...@@ -51,6 +52,7 @@ const FC = (props) => { ...@@ -51,6 +52,7 @@ const FC = (props) => {
React.useMemo(() => { React.useMemo(() => {
if (node) { if (node) {
setRow()
setSelectedRows([]) setSelectedRows([])
setPageAndArgs({ pageNum: 1, pageSize: page.pageSize }) setPageAndArgs({ pageNum: 1, pageSize: page.pageSize })
} }
...@@ -105,7 +107,7 @@ const FC = (props) => { ...@@ -105,7 +107,7 @@ const FC = (props) => {
const tableData = React.useMemo(() => { const tableData = React.useMemo(() => {
const newTableData = [] const newTableData = []
for (const item of (data??[])) { for (const item of (data??[])) {
const newAsset = {} const newAsset = {...item}
let index = 0 let index = 0
for (const elementValue of (item.elementValues??[])) { for (const elementValue of (item.elementValues??[])) {
for (const value of (elementValue.values??[])) { for (const value of (elementValue.values??[])) {
...@@ -150,6 +152,19 @@ const FC = (props) => { ...@@ -150,6 +152,19 @@ const FC = (props) => {
setLoading(false) setLoading(false)
setData(data?.data) setData(data?.data)
setTotal(data?.total) setTotal(data?.total)
setRow(prevRow => {
if (!prevRow) {
if ((data?.data??[]).length > 0) {
onClick?.(data?.data[0])
return data?.data[0]
} else {
onClick?.(undefined)
return undefined
}
}
return prevRow
})
}, },
error: () => { error: () => {
setLoading(false) setLoading(false)
...@@ -165,7 +180,14 @@ const FC = (props) => { ...@@ -165,7 +180,14 @@ const FC = (props) => {
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
pageSize={page.pageSize} pageNum={page.pageNum} total={total??0} pageSize={page.pageSize} pageNum={page.pageNum} total={total??0}
onRowClick={(event, value) => {
setRow(value)
onClick?.(value)
}}
rowClassName={(record, index) => (record?.id === row?.id) ? 'yy-table-select-row' : ''}
onPaginate={(page, pageSize) => { onPaginate={(page, pageSize) => {
setRow()
setSelectedRows([])
setPageAndArgs({ pageNum: page, pageSize }) setPageAndArgs({ pageNum: page, pageSize })
}} }}
rowSelection={{ rowSelection={{
......
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