Merge pull request #257 from xamu-co/dev

Extend Pagination content table action slots

Author: vis97c

packages/components-vue/src/components/pagination/ContentTable.vue

@@ -100,6 +100,18 @@
 								}"
 							></slot>
 						</template>
+						<template v-if="$slots.tableModifyActions" #modifyActions="modifyScope">
+							<slot name="tableModifyActions" v-bind="modifyScope"></slot>
+						</template>
+						<template
+							v-if="$slots.tableModifyDropdownActions"
+							#modifyDropdownActions="modifyDropdownScope"
+						>
+							<slot
+								name="tableModifyDropdownActions"
+								v-bind="modifyDropdownScope"
+							></slot>
+						</template>
 					</TableSimple>
 				</BaseErrorBoundary>
 			</div>

packages/components-vue/src/components/table/Body.vue

@@ -96,6 +96,7 @@
 						<slot
 							name="modifyActions"
 							v-bind="{
+								refresh,
 								nodeIndex: index,
 								node: nodes[index],
 								mappedNode: node,
@@ -178,6 +179,7 @@
 									<slot
 										name="modifyDropdownActions"
 										v-bind="{
+											refresh,
 											nodeIndex: index,
 											node: nodes[index],
 											mappedNode: node,
@@ -267,6 +269,7 @@
 						>
 							<slot
 								v-bind="{
+									refresh,
 									nodeIndex: index,
 									node: nodes[index],
 									mappedNode: node,

packages/components-vue/src/components/table/Simple.vue

@@ -242,18 +242,7 @@
 		if (!mappedNodes.value.nodes.length) return [];
 
 		const mappedNode: TM = mappedNodes.value.nodes[0].node;
-		const expectedProperties = props.properties.reduce<Record<string, true>>(
-			(acc, { value }) => {
-				acc[value] = true;
-
-				return acc;
-			},
-			{}
-		);
-		// Merge properties & sort
-		const sorted = Object.entries({ ...expectedProperties, ...mappedNode }).sort(
-			props.propertyOrder || useOrderProperty
-		);
+		const sorted = Object.entries(mappedNode).sort(props.propertyOrder || useOrderProperty);
 		const properties: iTablePropertyMeta<T>[] = [];
 
 		for (const [key, value] of sorted) {