|
@@ -5,7 +5,6 @@ import { ColumnsType } from 'antd/lib/table'
|
|
import styles from './index.less'
|
|
import styles from './index.less'
|
|
import useModal from '@/components/Modal'
|
|
import useModal from '@/components/Modal'
|
|
import AddAssemblyModal from './AddAssemblyModal'
|
|
import AddAssemblyModal from './AddAssemblyModal'
|
|
-import { createUid } from '@/utils/util'
|
|
|
|
import { queryMatterDetail } from '@/services/api/business'
|
|
import { queryMatterDetail } from '@/services/api/business'
|
|
import consts from '@/utils/consts'
|
|
import consts from '@/utils/consts'
|
|
|
|
|
|
@@ -31,7 +30,7 @@ interface IState {
|
|
|
|
|
|
const AssemblyDetail: React.FC<AssemblyDetailProps> = ({ refresh, record }) => {
|
|
const AssemblyDetail: React.FC<AssemblyDetailProps> = ({ refresh, record }) => {
|
|
const [state, setState] = useState<IState>({
|
|
const [state, setState] = useState<IState>({
|
|
- matterDetail: []
|
|
|
|
|
|
+ matterDetail: {}
|
|
})
|
|
})
|
|
const [modal, ModalDOM] = useModal()
|
|
const [modal, ModalDOM] = useModal()
|
|
const tRef = useRef()
|
|
const tRef = useRef()
|
|
@@ -44,19 +43,19 @@ const AssemblyDetail: React.FC<AssemblyDetailProps> = ({ refresh, record }) => {
|
|
title: '组件名称',
|
|
title: '组件名称',
|
|
dataIndex: 'name',
|
|
dataIndex: 'name',
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
- renderText: name => <span>{assemblyToMap[name]?.name}</span>
|
|
|
|
|
|
+ renderText: (_, record) => <span>{assemblyToMap[record.type].name}</span>
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '组件类型',
|
|
title: '组件类型',
|
|
dataIndex: 'type',
|
|
dataIndex: 'type',
|
|
align: 'center',
|
|
align: 'center',
|
|
- renderText: type => <Tag color="blue">{assemblyToMap[type]?.type}</Tag>
|
|
|
|
|
|
+ renderText: (_, record) => <Tag color="blue">{assemblyToMap[record.type].type}</Tag>
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '组件标题',
|
|
title: '组件标题',
|
|
dataIndex: 'title',
|
|
dataIndex: 'title',
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
- renderText: title => <span>{assemblyToMap[title]?.title}</span>
|
|
|
|
|
|
+ renderText: (_, record) => <span>{assemblyToMap[record.type].title}</span>
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '操作',
|
|
title: '操作',
|
|
@@ -74,7 +73,7 @@ const AssemblyDetail: React.FC<AssemblyDetailProps> = ({ refresh, record }) => {
|
|
<div className={styles.drawerTableBox}>
|
|
<div className={styles.drawerTableBox}>
|
|
<ProTable
|
|
<ProTable
|
|
search={false}
|
|
search={false}
|
|
- rowKey="ID"
|
|
|
|
|
|
+ rowKey="type"
|
|
actionRef={tRef}
|
|
actionRef={tRef}
|
|
params={{ ID: record?.ID }}
|
|
params={{ ID: record?.ID }}
|
|
columns={columns}
|
|
columns={columns}
|
|
@@ -82,12 +81,10 @@ const AssemblyDetail: React.FC<AssemblyDetailProps> = ({ refresh, record }) => {
|
|
const { data = {}, code = -1 } = await queryMatterDetail(params)
|
|
const { data = {}, code = -1 } = await queryMatterDetail(params)
|
|
setState({ ...state, matterDetail: data })
|
|
setState({ ...state, matterDetail: data })
|
|
return {
|
|
return {
|
|
- data: data?.assembly.map(item => ({
|
|
|
|
- ID: createUid(),
|
|
|
|
- name: item,
|
|
|
|
- type: item,
|
|
|
|
- title: item
|
|
|
|
- })),
|
|
|
|
|
|
+ data:
|
|
|
|
+ data?.assembly?.map(item => ({
|
|
|
|
+ type: item
|
|
|
|
+ })) || [],
|
|
success: code === consts.RET_CODE.SUCCESS
|
|
success: code === consts.RET_CODE.SUCCESS
|
|
}
|
|
}
|
|
}}
|
|
}}
|