Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

web/client/src/sections/install/components/memberModal.jsx

@@ -234,7 +234,7 @@ function memberModal (props) {
                                         fontSize: 12, marginLeft: 8, lineHeight: 2, padding: '0px 5px',
                                         border: '1px solid rgba(255,51,0,0.3)', width: 515
                                     }}>
-                                        确定后“{anxinDelete.join('、')}”将被系统移除，原因是项目已在【项企】中被删除！
+                                        确定后“{anxinDelete.join('、')}”将被系统移除，原因是项目已在【项企】或【映射关系】中被删除！
                                     </div>
                                 </div>
                             ) : ('')

web/client/src/sections/install/containers/roles.jsx

@@ -76,22 +76,22 @@ const Roles = (props) => {
                                 return (
                                     <div className='myseparator' key={index} style={{ display: 'flex', alignItems: 'center' }}>
                                         {
-                                            row.correlationProject.length >= 3 ? (
-                                                <Tooltip content={item.pepProjectName}>
-                                                    <div style={{ width: item.pepProjectName.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.del ? '#F93920' : '' }}>
-                                                        {item.pepProjectName}
+                                            row?.correlationProject?.length >= 3 ? (
+                                                <Tooltip content={item.pepProjectName || item.name}>
+                                                    <div style={{ width: item?.pepProjectName?.length > 7 || item?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.del ? '#F93920' : '' }}>
+                                                        {item.pepProjectName || item.name}
                                                     </div>
                                                 </Tooltip>
-                                            ) : row.correlationProject.length == 2 ? (
-                                                <Tooltip content={item.pepProjectName}>
-                                                    <div style={{ width: item.pepProjectName.length > 12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}>
-                                                        {item.pepProjectName}
+                                            ) : row?.correlationProject?.length == 2 ? (
+                                                <Tooltip content={item.pepProjectName || item.name}>
+                                                    <div style={{ width: item?.pepProjectName?.length > 12 || item?.name?.length > 12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}>
+                                                        {item.pepProjectName || item.name}
                                                     </div>
                                                 </Tooltip>
                                             ) : (
-                                                <Tooltip content={item.pepProjectName}>
-                                                    <div style={{ width: item.pepProjectName.length > 25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}>
-                                                        {item.pepProjectName}
+                                                <Tooltip content={item.pepProjectName || item.name}>
+                                                    <div style={{ width: item?.pepProjectName?.length > 25 || item?.name?.length > 25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}>
+                                                        {item.pepProjectName || item.name}
                                                     </div>
                                                 </Tooltip>
                                             )
@@ -102,14 +102,14 @@ const Roles = (props) => {
                             })
                         }
                         {
-                            row.correlationProject.length > 3 ? (
+                            row?.correlationProject?.length > 3 ? (
                                 <Tooltip content={
                                     <div style={{ display: 'flex', flexWrap: 'wrap', width: '100%' }}>
                                         {
                                             row.correlationProject.map((item, index) => {
                                                 return (
                                                     <div key={index} style={{ color: item.del ? '#F93920' : '' }}>
-                                                        {item.pepProjectName}<span style={{ color: '#FFFFFF' }}>,</span>
+                                                        {item.pepProjectName || item.name}<span style={{ color: '#FFFFFF' }}>,</span>
                                                     </div>
                                                 )
                                             })
@@ -117,7 +117,7 @@ const Roles = (props) => {
                                     </div>
                                 } trigger="click" style={{ lineHeight: 2 }}>
                                     <div style={{ fontSize: 14, color: '#005ABD', marginLeft: 8, cursor: "pointer", }}>
-                                        +{row.correlationProject.length - 3}
+                                        +{row?.correlationProject?.length - 3}
                                     </div>
                                 </Tooltip>
                             ) : ('')
@@ -300,7 +300,7 @@ const Roles = (props) => {
                                 let anxinErrorList = []
                                 for (let i = 0; i < row.correlationProject.length; i++) {
                                     if (row.correlationProject[i].del) {
-                                        anxinErrorList.push(row.correlationProject[i].pepProjectName)
+                                        anxinErrorList.push(row.correlationProject[i].pepProjectName||row.correlationProject[i].name)
                                     }
                                     else {
                                         myanxinArr.push(row.correlationProject[i].id)