Merge 12ddafaf38e44dfe1d947f4c4a58a14c09a519cb into 5c7625c425f12330eec34870511c31667d9fe349

This commit is contained in:
rbertus2000 2025-04-04 19:26:57 +00:00 committed by GitHub
commit 68975ddeca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -117,7 +117,8 @@
grid-template-rows: auto 1fr;
grid-template-areas:
"selector selector selector"
"thumbnail keywords notes";
"thumbnail keywords notes"
"civimg civimg civimg";
}
}
@ -132,7 +133,8 @@
grid-template-areas:
"selector selector"
"thumbnail keywords"
"thumbnail notes";
"thumbnail notes"
"civimg civimg";
}
}
@ -149,7 +151,8 @@
"selector"
"keywords"
"thumbnail"
"notes";
"notes"
"civimg";
}
}
@ -171,6 +174,10 @@
.lora-manager-grid-notes {
grid-area: notes;
}
.lora-manager-grid-civimg {
grid-area: civimg;
}
.lora-manager-grid p {
margin-bottom: 2px;
@ -307,6 +314,8 @@
<a id="civitai-model-page" target="_blank"></a>
</p>
</div>
<div class="lora-manager-grid-civimg">
</div>
</div>`
let tabHTML=`
@ -675,6 +684,7 @@
LoraUI.keywordsField.value = ""
LoraUI.notesField.value = ""
LoraUI.hideCivitaiLink()
document.querySelector(".lora-manager-grid-civimg").innerHTML = ""
} else {
LoraUI.keywordsField.value = info.keywords.join("\n")
LoraUI.notesField.value = info.notes
@ -683,9 +693,10 @@
} else {
LoraUI.hideCivitaiLink()
}
document.querySelector(".lora-manager-grid-civimg").innerHTML = ""
}
})
Bucket.getImageAsDataURL(`${profileNameField.value}/lora/${LoraUI.modelField.value}.png`)
Bucket.getImageAsDataURL(`${profileNameField.value}/lora/${LoraUI.modelField.value.split("/").pop()}.png`)
.then((data) => {
LoraUI.image.src=data
LoraUI.image.classList.remove("displayNone")
@ -724,6 +735,35 @@
} else {
showToast("No keyword info found.")
}
if ("images" in json) {
json.images.forEach(element => {
if (blockNSFWField.checked) {
if (element.nsfw != "None") {
return
}
}
let civitimg = document.createElement("img")
fetch(element.url)
.then(result => result.blob())
.then(blob => {
civitimg.src = URL.createObjectURL(blob);
})
civitimg.style["max-width"] = "256px"
civitimg.style["max-height"] = "256px"
civitimg.alt = "Civitai image (nsfw: " + element.nsfw + ")"
document.querySelector(".lora-manager-grid-civimg").appendChild(civitimg)
civitimg.addEventListener("click", (e) => onUseAsThumbnailClick(
{
use_lora_model: LoraUI.modelField.value,
},
civitimg
))
});
} else {
showToast("No images found.")
}
if ("modelId" in json) {
LoraUI.showCivitaiLink("https://civitai.com/models/" + json.modelId)
} else {