Merge branch 'main' of github.com:devforth/adminforth into main

Author: ivictbor

Changelog.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
 ## [v1.5.9] - next
 
 ### Changed
@@ -13,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - show hook is now called as it was when user edits the page
+- fixed showRow in ShowTable.vue
 
 ## [v1.5.8]
 

adminforth/spa/src/components/ShowTable.vue

@@ -20,24 +20,34 @@
             :key="column.name"
             class="bg-lightForm bg-darkForm odd:dark:bg-gray-900 even:dark:bg-gray-800 dark:border-gray-700 block md:table-row"
           >
-            <td class="px-6 py-4 relative block md:table-cell font-bold md:font-normal pb-0 md:pb-4">
-              {{ column.label }}
-            </td>
-            <td class="px-6 py-4 whitespace-pre-wrap" :data-af-column="column.name">
-              <component
-                v-if="column?.components?.show"
-                :is="getCustomComponent(column?.components?.show)"
-                :resource="resource"
-                :meta="column.components.show.meta"
-                :column="column"
-                :record="record"
+            <component
+                v-if="column.components?.showRow"
+                  :is="getCustomComponent(column.components.showRow)"
+                  :meta="column.components.showRow.meta"
+                  :column="column"
+                  :resource="coreStore.resource"
+                  :record="coreStore.record"
               />
-              <ValueRenderer
-                v-else
-                :column="column"
-                :record="record"
-              />
-            </td>
+            <template v-else>
+              <td class="px-6 py-4 relative block md:table-cell font-bold md:font-normal pb-0 md:pb-4">
+                {{ column.label }}
+              </td>
+              <td class="px-6 py-4 whitespace-pre-wrap" :data-af-column="column.name">
+                <component
+                  v-if="column?.components?.show"
+                  :is="getCustomComponent(column?.components?.show)"
+                  :resource="resource"
+                  :meta="column.components.show.meta"
+                  :column="column"
+                  :record="record"
+                />
+                <ValueRenderer
+                  v-else
+                  :column="column"
+                  :record="record"
+                />
+              </td>
+            </template>
           </tr>
         </tbody>
       </table>
@@ -48,19 +58,24 @@
   import { defineProps } from 'vue';
   import ValueRenderer from '@/components/ValueRenderer.vue';
   import { getCustomComponent } from '@/utils';
-
+  import { useCoreStore } from '@/stores/core';
   defineProps<{ 
     columns: Array<{
         name: string;
         label: string;
         components?: {
-        show?: {
-            meta: Record<string, any>;
-        };
+          show?: {
+              meta: Record<string, any>;
+          };
+          showRow?: {
+              meta: Record<string, any>;
+          };
         };
     }>;
     groupName?: string | null;
     resource: Record<string, any>;
     record: Record<string, any>;
   }>();
+
+  const coreStore = useCoreStore();
   </script>