ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-24 21:10:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

New Condition Widget, WIP

Browse Source 
- Rename `c-object-view` to `u-angular-object-view-wrapper` and fix to
allow style settings to be applied to it;
This commit is contained in:
charlesh88 2020-03-25 17:15:56 -07:00
parent b7cea7b955
commit 0857fd95a7
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/flexibleLayout/components/flexible-layout.scss
View File

@ -313,8 +313,4 @@
margin: 0;
}
}
.c-object-view {
display: contents;
}
}

29
src/ui/components/ObjectView.vue
View File

@ -102,17 +102,20 @@ export default {
}
let keys = Object.keys(styleObj);
keys.forEach(key => {
if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('transparent') > -1)) {
if (this.$el.style[key]) {
this.$el.style[key] = '';
let firstChild = this.$el.querySelector(':first-child');
if (firstChild) {
if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('transparent') > -1)) {
if (firstChild.style[key]) {
firstChild.style[key] = '';
}
} else {
if (!styleObj.isStyleInvisible && firstChild.classList.contains(STYLE_CONSTANTS.isStyleInvisible)) {
firstChild.classList.remove(STYLE_CONSTANTS.isStyleInvisible);
} else if (styleObj.isStyleInvisible && !firstChild.classList.contains(styleObj.isStyleInvisible)) {
firstChild.classList.add(styleObj.isStyleInvisible);
}
firstChild.style[key] = styleObj[key];
}
} else {
if (!styleObj.isStyleInvisible && this.$el.classList.contains(STYLE_CONSTANTS.isStyleInvisible)) {
this.$el.classList.remove(STYLE_CONSTANTS.isStyleInvisible);
} else if (styleObj.isStyleInvisible && !this.$el.classList.contains(styleObj.isStyleInvisible)) {
this.$el.classList.add(styleObj.isStyleInvisible);
}
this.$el.style[key] = styleObj[key];
}
});
},
@ -129,7 +132,7 @@ export default {
}
this.viewContainer = document.createElement('div');
this.viewContainer.classList.add('c-object-view','u-contents');
this.viewContainer.classList.add('u-angular-object-view-wrapper');
this.$el.append(this.viewContainer);
let provider = this.getViewProvider();
if (!provider) {
@ -192,9 +195,9 @@ export default {
this.viewKey = viewKey;
this.initObjectStyles();
this.updateView(immediatelySelect);
this.initObjectStyles();
},
initObjectStyles() {
if (!this.styleRuleManager) {

12
src/ui/components/object-frame.scss
View File

@ -58,7 +58,7 @@
height: 0; // Chrome 73 overflow bug fix
overflow: auto;
.c-object-view {
.u-angular-object-view-wrapper {
.u-fills-container {
// Expand component types that fill a container
@include abs();
@ -69,7 +69,15 @@
.c-click-icon,
.c-button {
// Shrink buttons a bit when they appear in a frame
font-size: 0.85em;
font-size: 0.9em;
padding: 3px 5px;
}
}
.u-angular-object-view-wrapper {
@include test();
flex: 1 1 auto;
height: 100%;
width: 100%;
overflow: hidden;
}

2
src/ui/preview/Preview.vue
View File

@ -121,7 +121,7 @@ export default {
this.viewKey = view.key;
this.viewContainer = document.createElement('div');
this.viewContainer.classList.add('c-object-view','u-contents');
this.viewContainer.classList.add('u-angular-object-view-wrapper');
this.$refs.objectView.append(this.viewContainer);
this.view = this.currentView.view(this.domainObject, this.objectPath);