diff --git a/packages/console/src/components/Table/index.tsx b/packages/console/src/components/Table/index.tsx index ad43fa0ea..85f646230 100644 --- a/packages/console/src/components/Table/index.tsx +++ b/packages/console/src/components/Table/index.tsx @@ -14,7 +14,7 @@ type Props< TName extends FieldPath = FieldPath > = { rowGroups: Array>; - columns: Array>; + columns: Array>; rowIndexKey: TName; onClickRow?: (row: TFieldValues) => void; className?: string; @@ -90,7 +90,7 @@ const Table = < > {columns.map(({ dataIndex, colSpan, className, render }) => ( - {render(row[dataIndex], row)} + {render(row)} ))} diff --git a/packages/console/src/components/Table/types.ts b/packages/console/src/components/Table/types.ts index 9dc2bfc2b..c99d028c0 100644 --- a/packages/console/src/components/Table/types.ts +++ b/packages/console/src/components/Table/types.ts @@ -1,13 +1,10 @@ import type { Key, ReactNode } from 'react'; -import type { FieldPath, FieldPathValue, FieldValues } from 'react-hook-form'; +import type { FieldValues } from 'react-hook-form'; -export type Column< - TFieldValues extends FieldValues = FieldValues, - TName extends FieldPath = FieldPath -> = { +export type Column = { title: ReactNode; - dataIndex: TName; - render: (value: FieldPathValue, row: TFieldValues) => ReactNode; + dataIndex: string; + render: (row: TFieldValues) => ReactNode; colSpan?: number; className?: string; }; diff --git a/packages/console/src/pages/ApiResources/index.tsx b/packages/console/src/pages/ApiResources/index.tsx index cc9cc7954..fee262fa8 100644 --- a/packages/console/src/pages/ApiResources/index.tsx +++ b/packages/console/src/pages/ApiResources/index.tsx @@ -103,7 +103,7 @@ const ApiResources = () => { title: t('api_resources.api_name'), dataIndex: 'name', colSpan: 6, - render: (name, { id }) => ( + render: ({ id, name }) => ( } @@ -115,7 +115,7 @@ const ApiResources = () => { title: t('api_resources.api_identifier'), dataIndex: 'indicator', colSpan: 10, - render: (indicator) => , + render: ({ indicator }) => , }, ]} placeholder={ diff --git a/packages/console/src/pages/Applications/index.tsx b/packages/console/src/pages/Applications/index.tsx index 0b0bfd715..3547a6049 100644 --- a/packages/console/src/pages/Applications/index.tsx +++ b/packages/console/src/pages/Applications/index.tsx @@ -96,7 +96,7 @@ const Applications = () => { title: t('applications.application_name'), dataIndex: 'name', colSpan: 6, - render: (name, { type, id }) => ( + render: ({ id, name, type }) => ( { title: t('applications.app_id'), dataIndex: 'id', colSpan: 10, - render: (id) => , + render: ({ id }) => , }, ]} placeholder={ diff --git a/packages/console/src/pages/SignInExperience/tabs/Others/components/ManageLanguage/LanguageEditor/LanguageDetails.tsx b/packages/console/src/pages/SignInExperience/tabs/Others/components/ManageLanguage/LanguageEditor/LanguageDetails.tsx index 703b8dd91..f3609fe89 100644 --- a/packages/console/src/pages/SignInExperience/tabs/Others/components/ManageLanguage/LanguageEditor/LanguageDetails.tsx +++ b/packages/console/src/pages/SignInExperience/tabs/Others/components/ManageLanguage/LanguageEditor/LanguageDetails.tsx @@ -195,13 +195,13 @@ const LanguageDetails = () => { { title: t('sign_in_exp.others.manage_language.key'), dataIndex: 'phraseKey', - render: (phraseKey) => phraseKey, + render: ({ phraseKey }) => phraseKey, className: styles.sectionDataKey, }, { title: t('sign_in_exp.others.manage_language.logto_source_values'), dataIndex: 'sourceValue', - render: (sourceValue) => ( + render: ({ sourceValue }) => (
{sourceValue}
), }, @@ -229,7 +229,7 @@ const LanguageDetails = () => { ), dataIndex: 'fieldKey', - render: (fieldKey) => ( + render: ({ fieldKey }) => (