Skip to content

Commit ada286f

Browse files
committed
fix: from.options can be undefined, closes #1491
1 parent 7273c9a commit ada286f

File tree

1 file changed

+2
-2
lines changed
  • packages/app-backend-vue3/src/components

1 file changed

+2
-2
lines changed

packages/app-backend-vue3/src/components/data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,12 @@ function mergeOptions (
355355
from: any,
356356
instance: ComponentInstance
357357
) {
358-
if (!from) return to
359-
360358
if (typeof from === 'function') {
361359
from = from.options
362360
}
363361

362+
if (!from) return to
363+
364364
const { mixins, extends: extendsOptions } = from
365365

366366
extendsOptions && mergeOptions(to, extendsOptions, instance)

0 commit comments

Comments
 (0)