alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Selection] support getting object view's selection context (#2272)

Browse Source 
* Get selection context from object view for constructing the context in subobject view.

* Implement getSelectionContext for flexible layout provider and remove code that makes flexible layout self selectable.

* Get selection context from object frame when constructing context for frames.

* Disable Add button when selected parent is a flexible layout

* Make 'Add' button working for selected display layouts in a flexible layout.

* fix expand error and fix flexible layout toggle container issue

* Check for parent object before getting composition.
This commit is contained in:
Pegah Sarram
2019-02-01 17:40:30 -08:00
committed by Deep Tailor
parent e254fafb5c
commit 666bb41697
6 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/flexibleLayout/components/frame.vue
View File

@@ -35,7 +35,8 @@
v-if="domainObject"
:domain-object="domainObject"
:object-path="objectPath"
:has-frame="hasFrame">
:has-frame="hasFrame"
ref="objectFrame">
</object-frame>
<div class="c-fl-frame__size-indicator"
@@ -78,14 +79,14 @@ export default {
this.setSelection();
},
setSelection() {
let context = {
item: this.domainObject,
addContainer: this.addContainer,
type: 'frame',
frameId: this.frame.id
};
this.unsubscribeSelection = this.openmct.selection.selectable(this.$refs.frame, context, false);
this.$nextTick(function () {
let childContext = this.$refs.objectFrame.getSelectionContext();
childContext.item = this.domainObject;
childContext.type = 'frame';
childContext.frameId = this.frame.id;
this.unsubscribeSelection = this.openmct.selection.selectable(
this.$refs.frame, childContext, false);
});
},
initDrag(event) {
let type = this.openmct.types.get(this.domainObject.type),