Skip to content

Commit ac49402

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into next
2 parents 1c374a0 + 7f891d7 commit ac49402

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

adminforth/spa/src/afcl/AreaChart.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ watch(() => [options.value, chart.value], (value) => {
142142
if (!value || !chart.value) {
143143
return;
144144
}
145-
console.log('options changed', options.value);
146145
if (apexChart) {
147146
apexChart.updateOptions(options.value);
148147
} else {

adminforth/spa/src/views/ShowView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<template v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
1616
<component
17-
:is="getCustomComponent(action.customComponent) || CallActionWrapper"
17+
:is="action?.customComponent ? getCustomComponent(action.customComponent) : CallActionWrapper"
1818
:meta="action.customComponent?.meta"
1919
@callAction="(payload?) => startCustomAction(action.id, payload)"
2020
:disabled="actionLoadingStates[action.id]"

0 commit comments

Comments
 (0)