Merge pull request #6379 from getkirby/fix/section-table-columns

Fix table column regressions
getkirby · Apr 10, 2024 · 9389848 · 9389848
2 parents 281da3e + 7b5f3cf
commit 9389848
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/config/sections/mixins/layout.php b/config/sections/mixins/layout.php
@@ -137,12 +137,15 @@
 			$form = Form::for($model)->values();
 
 			foreach ($this->columns as $columnName => $column) {
-				// don't overwrite columns
-				$item[$columnName] ??= match (empty($column['value'])) {
+				$item[$columnName] = match (empty($column['value'])) {
 					// if column value defined, resolve the query
 					false   => $model->toString($column['value']),
-					// otherwise use the form value
-					default => $form[$column['id'] ?? $columnName] ?? null,
+					// otherwise use the form value,
+					// but don't overwrite columns
+					default =>
+						$item[$columnName] ??
+						$form[$column['id'] ?? $columnName] ??
+						null,
 				};
 			}
 

diff --git a/panel/src/components/Layout/Table.vue b/panel/src/components/Layout/Table.vue
@@ -91,6 +91,7 @@
 						<!-- Cell -->
 						<k-table-cell
 							v-for="(column, columnIndex) in columns"
+							:id="columnIndex"
 							:key="rowIndex + '-' + columnIndex"
 							:column="column"
 							:field="fields[columnIndex]"

diff --git a/panel/src/components/Layout/TableCell.vue b/panel/src/components/Layout/TableCell.vue
@@ -1,5 +1,10 @@
 <template>
-	<td :data-align="column.align" :data-mobile="mobile" class="k-table-cell">
+	<td
+		:data-align="column.align"
+		:data-column-id="id"
+		:data-mobile="mobile"
+		class="k-table-cell"
+	>
 		<!-- Table cell type component -->
 		<component
 			:is="component"
@@ -25,6 +30,7 @@ export default {
 		 * Optional corresponding field options
 		 */
 		field: Object,
+		id: String,
 		/**
 		 * Keep cell on mobile
 		 */