File tree Expand file tree Collapse file tree 2 files changed +15
-7
lines changed Expand file tree Collapse file tree 2 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -13,8 +13,10 @@ import { build as optionAccessor } from './option/accessor'
1313import type { OptionBuilder } from './optionBuilder'
1414import type { VueCons } from './index'
1515export type Cons = VueCons
16+
1617// export interface Cons { new(): any, prototype: any }
1718function ComponentOption ( cons : Cons , extend ?: any ) {
19+
1820 const optionBuilder : OptionBuilder = { }
1921 optionVModel ( cons , optionBuilder )
2022 optionComputed ( cons , optionBuilder ) //after VModel
Original file line number Diff line number Diff line change @@ -125,15 +125,21 @@ export function getSuperSlot(obj: any) {
125125
126126export function excludeNames ( names : string [ ] , slot : Slot ) {
127127 return names . filter ( name => {
128- for ( const mapName of slot . names . keys ( ) ) {
129- if ( [ 'watch' , 'hooks' ] . includes ( mapName ) ) {
130- continue
131- }
132- const map = slot . names . get ( mapName ) !
133- if ( map . has ( name ) ) {
134- return false
128+ let currSlot : Slot | null = slot
129+
130+ while ( currSlot != null ) {
131+ for ( const mapName of currSlot . names . keys ( ) ) {
132+ if ( [ 'watch' , 'hooks' ] . includes ( mapName ) ) {
133+ continue
134+ }
135+ const map = currSlot . names . get ( mapName ) !
136+ if ( map . has ( name ) ) {
137+ return false
138+ }
135139 }
140+ currSlot = getSuperSlot ( slot . master )
136141 }
142+
137143 return true
138144 } )
139145}
You can’t perform that action at this time.
0 commit comments