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'
13
13
import type { OptionBuilder } from './optionBuilder'
14
14
import type { VueCons } from './index'
15
15
export type Cons = VueCons
16
+
16
17
// export interface Cons { new(): any, prototype: any }
17
18
function ComponentOption ( cons : Cons , extend ?: any ) {
19
+
18
20
const optionBuilder : OptionBuilder = { }
19
21
optionVModel ( cons , optionBuilder )
20
22
optionComputed ( cons , optionBuilder ) //after VModel
Original file line number Diff line number Diff line change @@ -125,15 +125,21 @@ export function getSuperSlot(obj: any) {
125
125
126
126
export function excludeNames ( names : string [ ] , slot : Slot ) {
127
127
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
+ }
135
139
}
140
+ currSlot = getSuperSlot ( slot . master )
136
141
}
142
+
137
143
return true
138
144
} )
139
145
}
You can’t perform that action at this time.
0 commit comments