Merge "fix: fix getNameRender in table list"

This commit is contained in:
Zuul 2022-07-11 03:11:42 +00:00 committed by Gerrit Code Review
commit e91b5f129f
3 changed files with 4 additions and 3 deletions

View File

@ -434,7 +434,8 @@ export class BaseTable extends React.Component {
newRender = getNameRenderByRouter(newRender, column, rowKey);
}
if ((dataIndex === 'name' && linkPrefix) || isName) {
newRender = getNameRender(newRender, column);
const { rowKey } = this.props;
newRender = getNameRender(newRender, column, rowKey);
}
if (dataIndex === 'cost' || isPrice) {
newRender = this.getPriceRender(newRender, column);

View File

@ -49,6 +49,7 @@ export class Credentials extends Base {
{
title: t('ID/Name'),
dataIndex: 'name',
isName: true,
hasNoDetail: true,
},
{

View File

@ -139,7 +139,7 @@ const getLinkUrl = (prefix, id) => {
return `${prefix}/${id}`;
};
export const getNameRender = (render, column) => {
export const getNameRender = (render, column, rowKey) => {
if (render) {
return render;
}
@ -151,7 +151,6 @@ export const getNameRender = (render, column) => {
linkFunc,
hasNoDetail = false,
} = column;
const { rowKey } = this.props;
return (value, record) => {
const idValue = get(record, idKey || rowKey);
let url = null;