rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use dropdown separated from dataType in Vue

Browse source
This commit is contained in:
Joe Knapper 2026-02-13 12:13:39 +00:00 • committed by Julian Stirling
parent ae81520494
commit 5ae0f903d8
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/openflexure_microscope_server/ui.py
View file

@ -1,6 +1,6 @@
"""Functionality for communicating the required user interface for a thing.""" """Functionality for communicating the required user interface for a thing."""
from typing import Any from typing import Any, Optional
from pydantic import BaseModel from pydantic import BaseModel
@ -83,7 +83,7 @@ class PropertyControl(BaseModel):
read_back_delay: int = 1000 read_back_delay: int = 1000
"""The delay in ms before reading back the property.""" """The delay in ms before reading back the property."""
options: list[str] = [] options: Optional[list[str]] = None
"""A list of options to pass to the UI for a dropdown. """A list of options to pass to the UI for a dropdown.
These options aren't validated in the UI in any way, and invalid These options aren't validated in the UI in any way, and invalid

22
webapp/src/components/labThingsComponents/inputFromSchema.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<label v-if="dataType === 'dropdown'" class="uk-form-label"> <label v-if="useDropdown" class="uk-form-label">
{{ label }} {{ label }}
<div class="input-and-buttons-container"> <div class="input-and-buttons-container">
<select <select
@ -15,7 +15,7 @@
<sync-property-button @click="requestUpdate" /> <sync-property-button @click="requestUpdate" />
</div> </div>
</label> </label>
<label v-if="dataType == 'number'" class="uk-form-label" <label v-if="!useDropdown && dataType == 'number'" class="uk-form-label"
>{{ label }} >{{ label }}
<div class="input-and-buttons-container"> <div class="input-and-buttons-container">
<input <input
@ -33,7 +33,7 @@
<sync-property-button @click="requestUpdate" /> <sync-property-button @click="requestUpdate" />
</div> </div>
</label> </label>
<div v-if="dataType == 'boolean'" class="input-and-buttons-container"> <div v-if="!useDropdown && dataType == 'boolean'" class="input-and-buttons-container">
<label class="uk-form-label numeric-setting-line-input"> <label class="uk-form-label numeric-setting-line-input">
<input <input
ref="checkbox" ref="checkbox"
@ -47,7 +47,7 @@
</label> </label>
<sync-property-button @click="requestUpdate" /> <sync-property-button @click="requestUpdate" />
</div> </div>
<label v-if="dataType == 'number_array'" class="uk-form-label" <label v-if="!useDropdown && dataType == 'number_array'" class="uk-form-label"
>{{ label }} >{{ label }}
<div class="input-and-buttons-container"> <div class="input-and-buttons-container">
<input <input
@ -66,7 +66,7 @@
<sync-property-button @click="requestUpdate" /> <sync-property-button @click="requestUpdate" />
</div> </div>
</label> </label>
<label v-if="dataType == 'number_object'" class="uk-form-label" <label v-if="!useDropdown && dataType == 'number_object'" class="uk-form-label"
>{{ label }} >{{ label }}
<div v-for="(val, key) in modelValue" :key="key"> <div v-for="(val, key) in modelValue" :key="key">
<label>{{ internalLabels[key] }}</label> <label>{{ internalLabels[key] }}</label>
@ -86,7 +86,7 @@
</div> </div>
</div> </div>
</label> </label>
<label v-if="dataType == 'string'" class="uk-form-label" <label v-if="!useDropdown && dataType == 'string'" class="uk-form-label"
>{{ label }} >{{ label }}
<div class="input-and-buttons-container"> <div class="input-and-buttons-container">
<input <input
@ -102,7 +102,7 @@
<sync-property-button @click="requestUpdate" /> <sync-property-button @click="requestUpdate" />
</div> </div>
</label> </label>
<label v-if="dataType == 'other'" class="uk-form-label" <label v-if="!useDropdown && dataType == 'other'" class="uk-form-label"
>{{ label }} >{{ label }}
<div class="input-and-buttons-container"> <div class="input-and-buttons-container">
<input <input
@ -145,7 +145,7 @@ export default {
}, },
options: { options: {
type: Array, type: Array,
default: () => [], default: undefined,
required: false, required: false,
}, },
}, },
@ -196,15 +196,15 @@ export default {
form.op?.includes('writeproperty') form.op?.includes('writeproperty')
); );
}, },
useDropdown: function () {
return Array.isArray(this.options) && this.options.length > 1;
},
dataType: function () { dataType: function () {
let prop = this.dataSchema; let prop = this.dataSchema;
if (prop == undefined) { if (prop == undefined) {
return "undefined"; return "undefined";
} }
const num_types = ["integer", "float", "number"]; const num_types = ["integer", "float", "number"];
if (this.options && this.options.length > 1) {
return "dropdown";
}
if (num_types.includes(prop.type)) { if (num_types.includes(prop.type)) {
return "number"; return "number";
} }

2
webapp/src/components/labThingsComponents/propertyControl.vue
View file

@ -47,7 +47,7 @@ export default {
}, },
options: { options: {
type: Array, type: Array,
default: () => [], default: undefined,
required: false, required: false,
}, },
}, },