bug fix

src/view/Manage/ModelCompareList/index.jsx

@@ -48,7 +48,7 @@ const FC = (props) => {
     {
       title: '冲突的分支',
       dataIndex: 'conflictDataModelName',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={`${record.conflictBranch?.name}/${text}`}>
         <Typography.Text>
           <a onClick={() => {
             openNoticeDataModelByVersionId(record.conflictEasyDataModelerDataModelId)
@@ -61,14 +61,14 @@ const FC = (props) => {
     {
       title: '分支状态',
       dataIndex: 'branchState',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={record.conflictModelShowState?.name}>
         <Typography.Text>{record.conflictModelShowState?.name}</Typography.Text>
       </Tooltip>
     },
     {
       title: '处理记录',
       dataIndex: 'processed',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={record.processed?'已处理':'未处理'}>
         <Typography.Text>{record.processed?'已处理':'未处理'}</Typography.Text>
       </Tooltip>
     },
@@ -121,7 +121,7 @@ const FC = (props) => {
     {
       title: '提交评审的分支',
       dataIndex: 'operationDataModelName',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={`${record.operationBranch?.name}/${text}`}>
         <Typography.Text>
           <a onClick={() => {
             openNoticeDataModelById(record.operationEasyDataModelerDataModelId, record.operationDataModelLatestVersionId)
@@ -134,14 +134,14 @@ const FC = (props) => {
     {
       title: '项目负责人',
       dataIndex: 'members',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={record.operationBranch?.easyDataModelerMemberShip?.easyDataModelerMembers.map(item => item.dname).toString()}>
         <Typography.Text>{record.operationBranch?.easyDataModelerMemberShip?.easyDataModelerMembers.map(item => item.dname).toString()}</Typography.Text>
       </Tooltip>
     },
     {
       title: '冲突的分支',
       dataIndex: 'conflictDataModelName',
-      render:(text, record, index)=> <Tooltip title={text}>
+      render:(text, record, index)=> <Tooltip title={`${record.conflictBranch?.name}/${text}`}>
         <Typography.Text>
           <a onClick={() => {
             openNoticeDataModelByVersionId(record.conflictEasyDataModelerDataModelId)