diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue index 84c8f7a4..9e272cea 100644 --- a/ayanova/src/components/pick-list.vue +++ b/ayanova/src/components/pick-list.vue @@ -17,7 +17,7 @@ :search-input.sync="searchEntry" :filter="customFilter" hide-no-data - :clearable="!readonly" + :clearable="!readonly && canClear" :no-filter="isTagFilter" :append-icon="errorIcon" @click:append="handleErrorClick" @@ -76,8 +76,12 @@ export default { showEditIcon: { type: Boolean, default: false + }, + allowNoSelection: { + type: Boolean, + default: true }, - + canClear:{type: Boolean, default: true}, label: { type: String, default: "" } }, watch: { @@ -166,9 +170,11 @@ export default { e = window.$gz.form.getNoSelectionItem(true); } + this.lastSelection = e; + //this is required for the control to update and parent form to detect it this.$emit("input", e.id); - this.lastSelection = e; + }, fetchValueIfNotPresent() { //is there a value that might require fetching? @@ -274,7 +280,9 @@ export default { return Promise.reject(res); } vm.searchResults = res.data; + if(vm.allowNoSelection){ window.$gz.form.addNoSelectionItem(vm.searchResults, true); + } vm.replaceLastSelection(); } catch (err) { window.$gz.errorHandler.handleFormError(err); diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue index ea6ebd97..9de75174 100644 --- a/ayanova/src/views/home-memo.vue +++ b/ayanova/src/views/home-memo.vue @@ -33,6 +33,32 @@