From da823ae5233249a64d3839344a4ac0504eca8d59 Mon Sep 17 00:00:00 2001 From: xusongfu Date: Fri, 8 Jul 2022 15:39:21 +0800 Subject: [PATCH] fix: fix getNameRender in table list 1. fix the getNameRender to get rigth rowkey 2. fix the name column showing in user center credentials Change-Id: I59d79937c388c77142b09494f0b3f351440ddddd --- src/components/Tables/Base/index.jsx | 3 ++- src/pages/user-center/containers/Credentials/index.jsx | 1 + src/utils/table.jsx | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Tables/Base/index.jsx b/src/components/Tables/Base/index.jsx index a9719971..1a1d8bcd 100644 --- a/src/components/Tables/Base/index.jsx +++ b/src/components/Tables/Base/index.jsx @@ -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); diff --git a/src/pages/user-center/containers/Credentials/index.jsx b/src/pages/user-center/containers/Credentials/index.jsx index 2e52e2ad..a2b57910 100644 --- a/src/pages/user-center/containers/Credentials/index.jsx +++ b/src/pages/user-center/containers/Credentials/index.jsx @@ -49,6 +49,7 @@ export class Credentials extends Base { { title: t('ID/Name'), dataIndex: 'name', + isName: true, hasNoDetail: true, }, { diff --git a/src/utils/table.jsx b/src/utils/table.jsx index cba3af7a..f4f6c015 100644 --- a/src/utils/table.jsx +++ b/src/utils/table.jsx @@ -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;