@@ -24,7 +24,6 @@ Description:
24
24
:z =" componentData.z"
25
25
:w =" componentData.w"
26
26
:h =" componentData.h"
27
- :parent =" true"
28
27
:preventDeactivation =" true"
29
28
@activated =" onActivated(componentData)"
30
29
@deactivated =" onDeactivated(componentData)"
@@ -231,7 +230,7 @@ export default {
231
230
if (
232
231
// this.activeComponent === element.$attrs.id &&
233
232
// element.enabled === false
234
- this .activeComponent === element .id &&
233
+ this .activeComponent === element .$attrs . id &&
235
234
element .enabled === false
236
235
) {
237
236
element .enabled = true ;
@@ -339,7 +338,7 @@ export default {
339
338
// console.log('onActivated - comp display, componentData', componentData)
340
339
if (this .$refs .boxes ) {
341
340
this .$refs .boxes .forEach (element => {
342
- if (element .id !== componentData .componentName ) {
341
+ if (element .$attrs . id !== componentData .componentName ) {
343
342
console .log (' Emit' )
344
343
element .enabled = false ;
345
344
element .$emit (" deactivated" );
@@ -355,7 +354,7 @@ export default {
355
354
this .activeComponentData .isActive = true ;
356
355
},
357
356
// deactivated is emitted before activated
358
- onDeactivated () {
357
+ onDeactivated (type ) {
359
358
console .log (' This is DEACTIVATED' )
360
359
if (this .activeComponent !== " " ) {
361
360
this .activeComponentData .isActive = false ;
@@ -401,7 +400,7 @@ export default {
401
400
if (this .activeComponent ) {
402
401
this .onActivated (this .activeComponentObj );
403
402
} else {
404
- this .onDeactivated ();
403
+ this .onDeactivated (' bgClick ' );
405
404
}
406
405
}
407
406
}
0 commit comments