diff --git a/frontend/components/dropdown/Dropdown.vue b/frontend/components/dropdown/Dropdown.vue index f3a7755184095955f466f6c2dc755cfdd0e4da38..017e0661bb817e2b9109309bd3a3487b35e32554 100644 --- a/frontend/components/dropdown/Dropdown.vue +++ b/frontend/components/dropdown/Dropdown.vue @@ -49,15 +49,34 @@ export default { var urlGet = '/api/image/datasets' const response = await this.$axios.get(urlGet).catch((error) => console.error(error)) if (response.data.status === "success") { - response.data.data.forEach((dataset) => { - var key = "value" - var obj = {} - obj[key] = dataset - this.config.options.push(obj) - }) + if (response.data.data) { + response.data.data.forEach((dataset) => { + var key = "value" + var obj = {} + obj[key] = dataset + this.config.options.push(obj) + }) + } } if (this.dropdownValue) { this.config.placeholder = this.dropdownValue + } else { + if (!this.isFolderNotExist()) { + if (this.isUpload) { + this.config.placeholder = this.config.options[1].value + } else { + this.config.placeholder = this.config.options[0].value + } + this.dataset = this.config.placeholder + this.$emit("onDatasetChanged", this.dataset) + } + } + }, + isFolderNotExist () { + if (this.isUpload) { + return this.config.options.length <= 1 + } else { + return this.config.options.length <= 0 } }, async setNewSelectedOption(selectedOption) { diff --git a/frontend/components/label/Label.vue b/frontend/components/label/Label.vue index 412d4c60f81435c3fe4eacb021ea569eb811a948..80354ab045c2c3c8cc6712b21d9d7af297f201d4 100644 --- a/frontend/components/label/Label.vue +++ b/frontend/components/label/Label.vue @@ -98,7 +98,7 @@ export default { images: {}, keyword: '', isViewerActive: false, - perPage: 3, + perPage: 12, totalRows: 0, page: 1, timer: '', @@ -243,6 +243,7 @@ export default { .slot-margin { margin-left: 1.5rem; + margin-top: -0.15rem; } .flex-display {