Stopped inactive properties from showing computed inline fields, since they are not recomputed while inactive
This commit is contained in:
@@ -22,10 +22,12 @@ export default {
|
|||||||
return [];
|
return [];
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
inactive: Boolean,
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
computedValue(){
|
computedValue(){
|
||||||
if (!this.string) return '';
|
if (!this.string) return '';
|
||||||
|
if (this.inactive) return this.string;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
return this.string.replace(/\{([^{}]*)\}/g, () => {
|
return this.string.replace(/\{([^{}]*)\}/g, () => {
|
||||||
let comp = this.calculations && this.calculations[index++];
|
let comp = this.calculations && this.calculations[index++];
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</v-card-title>
|
</v-card-title>
|
||||||
|
|||||||
@@ -74,6 +74,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.summary"
|
:string="model.summary"
|
||||||
:calculations="model.summaryCalculations"
|
:calculations="model.summaryCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
<v-divider
|
<v-divider
|
||||||
v-if="children.length"
|
v-if="children.length"
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
<computed
|
<computed
|
||||||
:string="model.summary"
|
:string="model.summary"
|
||||||
:calculations="model.summaryCalculations"
|
:calculations="model.summaryCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
</toolbar-card>
|
</toolbar-card>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
</v-card>
|
</v-card>
|
||||||
|
|||||||
@@ -105,6 +105,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.summary"
|
:string="model.summary"
|
||||||
:calculations="model.summaryCalculations"
|
:calculations="model.summaryCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
<v-divider
|
<v-divider
|
||||||
v-if="model.description"
|
v-if="model.description"
|
||||||
@@ -114,6 +115,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<effect-viewer
|
<effect-viewer
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -46,6 +46,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -4,11 +4,13 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.summary"
|
:string="model.summary"
|
||||||
:calculations="model.summaryCalculations"
|
:calculations="model.summaryCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
<v-divider class="mt-3 mb-3" />
|
<v-divider class="mt-3 mb-3" />
|
||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -111,6 +111,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<effect-viewer
|
<effect-viewer
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
<property-description
|
<property-description
|
||||||
:string="model.description"
|
:string="model.description"
|
||||||
:calculations="model.descriptionCalculations"
|
:calculations="model.descriptionCalculations"
|
||||||
|
:inactive="model.inactive"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
class="property-description"
|
class="property-description"
|
||||||
:string="string"
|
:string="string"
|
||||||
:calculations="calculations"
|
:calculations="calculations"
|
||||||
|
:inactive="inactive"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@ export default {
|
|||||||
return [];
|
return [];
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
inactive: Boolean,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user