Merge branch 'upgrade-moment' of https://github.com/nasa/openmct into upgrade-moment

This commit is contained in:
Andrew Henry 2020-05-05 10:36:43 -07:00
commit 447fe94325
5 changed files with 18 additions and 3 deletions

View File

@ -157,7 +157,6 @@ export default class StyleRuleManager extends EventEmitter {
delete this.stopProvidingTelemetry;
this.conditionSetIdentifier = undefined;
this.isEditing = undefined;
this.callback = undefined;
}
}

View File

@ -30,6 +30,7 @@
>
<div class="c-condition-h__drop-target"></div>
<div v-if="isEditing"
:class="{'is-current': condition.id === currentConditionId}"
class="c-condition c-condition--edit"
>
<!-- Edit view -->
@ -167,6 +168,7 @@
</div>
<div v-else
class="c-condition c-condition--browse"
:class="{'is-current': condition.id === currentConditionId}"
>
<!-- Browse view -->
<div class="c-condition__header">
@ -199,6 +201,10 @@ export default {
ConditionDescription
},
props: {
currentConditionId: {
type: String,
default: ''
},
condition: {
type: Object,
required: true

View File

@ -58,6 +58,7 @@
<Condition v-for="(condition, index) in conditionCollection"
:key="condition.id"
:condition="condition"
:current-condition-id="currentConditionId"
:condition-index="index"
:telemetry="telemetryObjs"
:is-editing="isEditing"
@ -107,7 +108,8 @@ export default {
moveIndex: undefined,
isDragging: false,
defaultOutput: undefined,
dragCounter: 0
dragCounter: 0,
currentConditionId: ''
};
},
watch: {
@ -145,6 +147,7 @@ export default {
},
methods: {
handleConditionSetResultUpdated(data) {
this.currentConditionId = data.conditionId;
this.$emit('conditionSetResultUpdated', data)
},
observeForChanges() {

View File

@ -190,6 +190,7 @@
}
.c-condition {
border: 1px solid transparent;
flex-direction: column;
min-width: 400px;
@ -234,6 +235,12 @@
&__summary {
flex: 1 1 auto;
}
&.is-current {
$c: $colorBodyFg;
border-color: rgba($c, 0.2);
background: rgba($c, 0.2);
}
}
/***************************** CONDITION DEFINITION, EDITING */

View File

@ -65,7 +65,7 @@
&.is-current {
$c: $colorBodyFg;
border-color: rgba($c, 0.5);
border-color: rgba($c, 0.2);
background: rgba($c, 0.2);
}