fix CardList

2025-10-20 16:00:15 +07:00
parent 6a9bbb2b5e
commit 6d45b5bf11
1 changed files with 9 additions and 7 deletions
--- a/src/components/Global/CardList.jsx
+++ b/src/components/Global/CardList.jsx
@@ -80,16 +80,18 @@ const CardList = ({
                        ]}
                    >
                        <div style={{ textAlign: 'left' }}>
-                            {column.map((itemCard) => (
-                                <>
-                                    {!itemCard.hidden && !itemCard.render && (
-                                        <p>
+                            {column.map((itemCard, index) => (
+                                <React.Fragment key={index}>
+                                    {!itemCard.hidden && itemCard.title !== 'No' && itemCard.title !== 'Aksi' && (
+                                        <p style={{ margin: '8px 0' }}>
                                            <Text strong>{itemCard.title}:</Text>{' '}
-                                            {item[itemCard.key]}
+                                            {itemCard.render
+                                                ? itemCard.render(item[itemCard.dataIndex], item, index)
+                                                : item[itemCard.dataIndex] || item[itemCard.key] || '-'
+                                            }
                                        </p>
                                    )}
-                                    {itemCard.render && itemCard.render}
-                                </>
+                                </React.Fragment>
                            ))}
                        </div>
                    </Card>