From ee663157b72844ddd4989c52e05d198aeec350ee Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 14 Aug 2023 22:01:50 +0200 Subject: [PATCH] chore(Table): handle `loading-state` prop merge like `empty-state` --- src/runtime/components/data/Table.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue index f1e82926..25ea496b 100644 --- a/src/runtime/components/data/Table.vue +++ b/src/runtime/components/data/Table.vue @@ -180,6 +180,11 @@ export default defineComponent({ return { ...ui.value.default.emptyState, ...props.emptyState } }) + const loadingState = computed(() => { + if (props.loadingState === null) return null + return { ...ui.value.default.loadingState, ...props.loadingState } + }) + function compare (a: any, z: any) { if (typeof props.by === 'string') { const property = props.by as unknown as any @@ -257,6 +262,8 @@ export default defineComponent({ indeterminate, // eslint-disable-next-line vue/no-dupe-keys emptyState, + // eslint-disable-next-line vue/no-dupe-keys + loadingState, isSelected, onSort, onSelect,