baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: fix getNameRender in table list"

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Tables/Base/index.jsx
View File

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

1
src/pages/user-center/containers/Credentials/index.jsx
View File

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

3
src/utils/table.jsx
View File

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