Commit 2b3c742c by zhaochengxiang

bug fix

parent 1acc0a5f
...@@ -57,7 +57,6 @@ const FC = (props) => { ...@@ -57,7 +57,6 @@ const FC = (props) => {
const [loading, setLoading] = React.useState(false) const [loading, setLoading] = React.useState(false)
const [data, setData] = React.useState() const [data, setData] = React.useState()
const [users, setUsers] = React.useState() const [users, setUsers] = React.useState()
const [row, setRow] = React.useState()
const [isAdmin, setAdmin] = React.useState() const [isAdmin, setAdmin] = React.useState()
const [importAssetParams, setImportAssetParams] = React.useState({ const [importAssetParams, setImportAssetParams] = React.useState({
visible: false visible: false
...@@ -669,7 +668,7 @@ const FC = (props) => { ...@@ -669,7 +668,7 @@ const FC = (props) => {
} }
}} }}
rowClassName={(record, index) => { rowClassName={(record, index) => {
return (record?.id === row?.id) ? 'yy-table-select-row' : '' return (record?.id === rightRow?.id) ? 'yy-table-select-row' : ''
}} }}
shouldRowContextMenu={(record) => { shouldRowContextMenu={(record) => {
setRightRow(record) setRightRow(record)
......
...@@ -4,7 +4,7 @@ import LocalStorage from 'local-storage' ...@@ -4,7 +4,7 @@ import LocalStorage from 'local-storage'
import { Space, Select, Button, Tooltip, Input, Typography, Modal, Pagination, Divider } from 'antd' import { Space, Select, Button, Tooltip, Input, Typography, Modal, Pagination, Divider } from 'antd'
import { appId } from "../../../App" import { appId } from "../../../App"
import Table from '../ResizeableTable' import Table from '../../../util/Component/Table'
import { highlightSearchContentByTerms, isSzseEnv, showMessage } from "../../../util" import { highlightSearchContentByTerms, isSzseEnv, showMessage } from "../../../util"
import { AssetItem } from "../AssetManage/Component/AssetTable" import { AssetItem } from "../AssetManage/Component/AssetTable"
import UpdateAsset from "../AssetManage/Component/AssetDetailDrawer" import UpdateAsset from "../AssetManage/Component/AssetDetailDrawer"
...@@ -14,6 +14,10 @@ import { getTemplateType } from "../../../util/axios" ...@@ -14,6 +14,10 @@ import { getTemplateType } from "../../../util/axios"
import FilterElementModal from '../AssetManage/Component/FilterElementModal' import FilterElementModal from '../AssetManage/Component/FilterElementModal'
import PermissionButton from '../../../util/Component/PermissionButton' import PermissionButton from '../../../util/Component/PermissionButton'
const operationMap = {
view: '查看',
}
const FC = (props) => { const FC = (props) => {
const [loadingTemplates, setLoadingTemplates] = React.useState(false) const [loadingTemplates, setLoadingTemplates] = React.useState(false)
const [templates, setTemplates] = React.useState() const [templates, setTemplates] = React.useState()
...@@ -25,7 +29,6 @@ const FC = (props) => { ...@@ -25,7 +29,6 @@ const FC = (props) => {
const [filterElements, setFilterElements] = React.useState() const [filterElements, setFilterElements] = React.useState()
const [loading, setLoading] = React.useState(false) const [loading, setLoading] = React.useState(false)
const [data, setData] = React.useState() const [data, setData] = React.useState()
const [row, setRow] = React.useState()
const [updateAssetParams, setUpdateAssetParams] = React.useState({ const [updateAssetParams, setUpdateAssetParams] = React.useState({
visible: false, visible: false,
id: undefined, id: undefined,
...@@ -34,6 +37,7 @@ const FC = (props) => { ...@@ -34,6 +37,7 @@ const FC = (props) => {
const [filterElementParams, setFilterElementParams] = React.useState({ const [filterElementParams, setFilterElementParams] = React.useState({
visible: false, visible: false,
}) })
const [rightRow, setRightRow] = React.useState()
const [modal, contextHolder] = Modal.useModal() const [modal, contextHolder] = Modal.useModal()
...@@ -155,6 +159,16 @@ const FC = (props) => { ...@@ -155,6 +159,16 @@ const FC = (props) => {
return [_canExport, _canDelete, _canRecover] return [_canExport, _canDelete, _canRecover]
}, [selectedRows]) }, [selectedRows])
const menuData = React.useMemo(() => {
const newMenuData = []
for (const key of rightRow?.allowButtons??[]) {
if (operationMap[key]) {
newMenuData.push(operationMap[key])
}
}
return newMenuData
}, [rightRow])
const getTemplates = () => { const getTemplates = () => {
setLoadingTemplates(true) setLoadingTemplates(true)
dispatch({ dispatch({
...@@ -264,6 +278,20 @@ const FC = (props) => { ...@@ -264,6 +278,20 @@ const FC = (props) => {
}) })
} }
const onRightMenuItemClick = (key, record) => {
if (key === '查看') {
onRightDetailClick()
}
}
const onRightDetailClick = () => {
setUpdateAssetParams({
visible: true,
id: rightRow?.id,
dirId: rightRow?.dirId,
})
}
return ( return (
<div style={{ backgroundColor: '#fff', height: '100%' }}> <div style={{ backgroundColor: '#fff', height: '100%' }}>
<div className='flex p-3' style={{ <div className='flex p-3' style={{
...@@ -334,21 +362,24 @@ const FC = (props) => { ...@@ -334,21 +362,24 @@ const FC = (props) => {
setSelectedRows(selectedRows) setSelectedRows(selectedRows)
} }
}} }}
onRow={(record) => { rowClassName={(record, index) => {
return { return (record?.id === rightRow?.id) ? 'yy-table-select-row' : ''
onClick: (e) => { }}
setRow(record) shouldRowContextMenu={(record) => {
setUpdateAssetParams({ setRightRow(record)
visible: true, let allowContextMenu = false
id: record?.id,
dirId: record?.dirId, for (const key of (record.allowButtons??[])) {
}) if (operationMap[key]) {
allowContextMenu = true
break
} }
} }
return allowContextMenu
}} }}
rowClassName={(record, index) => { menuData={menuData}
return (record?.id === row?.id) ? 'yy-table-select-row' : '' menuPermissions={menuData}
}} onMenuItemClick={onRightMenuItemClick}
scroll={{ y: 'calc(100vh - 209px - 72px - 57px)' }} scroll={{ y: 'calc(100vh - 209px - 72px - 57px)' }}
/> />
<Pagination <Pagination
......
...@@ -238,9 +238,7 @@ const List = React.forwardRef(function ({ items }, ref) { ...@@ -238,9 +238,7 @@ const List = React.forwardRef(function ({ items }, ref) {
render: (text, record) => ( render: (text, record) => (
<Tooltip title={text}> <Tooltip title={text}>
<Typography.Text ellipsis={true}> <Typography.Text ellipsis={true}>
<a onClick={() => { {text}
}}>{text}</a>
</Typography.Text> </Typography.Text>
</Tooltip> </Tooltip>
) )
......
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