Refactor toast notifications and improve LoraCard interactions

This commit is contained in:
Will Miao
2025-02-05 16:41:12 +08:00
parent 0bbecd7197
commit e2793a71be
4 changed files with 90 additions and 126 deletions

View File

@@ -583,31 +583,6 @@ body.modal-open {
margin: var(--space-2) 0; margin: var(--space-2) 0;
} }
.trigger-words-categories {
flex: 0 0 200px;
border-right: 1px solid var(--lora-border);
padding-right: var(--space-2);
}
.trigger-category {
padding: 8px;
margin-bottom: 4px;
border-radius: var(--border-radius-xs);
cursor: pointer;
color: var(--text-color);
font-size: 0.9em;
transition: background-color 0.2s;
}
.trigger-category:hover {
background: var(--lora-border);
}
.trigger-category.active {
background: var(--lora-accent);
color: white;
}
.trigger-words-list { .trigger-words-list {
flex: 1; flex: 1;
display: flex; display: flex;
@@ -708,61 +683,80 @@ body.modal-open {
/* Toast Notifications */ /* Toast Notifications */
.toast { .toast {
position: fixed; position: fixed;
bottom: 20px; top: 20px; /* 改为从顶部显示 */
left: 50%; right: 20px; /* 改为右对齐 */
transform: translateX(-50%) translateY(100px); left: auto; /* 移除左对齐 */
transform: translateX(120%); /* 初始位置在屏幕右侧外 */
min-width: 300px; /* 设置最小宽度 */
max-width: 400px; /* 设置最大宽度 */
background: var(--lora-surface); background: var(--lora-surface);
color: var(--text-color); color: var(--text-color);
padding: 12px 24px; padding: 12px 16px;
border-radius: var(--border-radius-sm); border-radius: var(--border-radius-sm);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
z-index: calc(var(--z-overlay) + 10); /* 确保 toast 显示在模态窗口之上 */ /* z-index: calc(var(--z-overlay) + 10); */
z-index: 1000; /* 保证在其他元素之上 */
opacity: 0; opacity: 0;
transition: transform 0.3s ease-out, opacity 0.3s ease-out; transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1),
text-align: center; opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1);
max-width: 90%; display: flex;
backdrop-filter: blur(8px); align-items: center;
border: 1px solid var(--lora-border); gap: 12px;
}
/* 当模态窗口打开时的 toast 样式 */
body.modal-open .toast {
bottom: 50% !important; /* 强制覆盖默认位置 */
transform: translate(-50%, 50%) !important; /* 强制覆盖默认变换 */
background: var(--lora-accent);
color: white;
z-index: 9999; /* 确保显示在最上层 */
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.25);
} }
.toast.show { .toast.show {
transform: translateX(-50%) translateY(0); transform: translateX(0); /* 显示时滑入到正确位置 */
opacity: 1; opacity: 1;
} }
/* 确保在模态窗口打开时,不同类型的 toast 依然可辨识 */ /* 添加图标容器 */
body.modal-open .toast-success { .toast::before {
background: oklch(65% 0.2 142); /* 绿色 */ content: '';
} width: 20px;
height: 20px;
body.modal-open .toast-error { flex-shrink: 0;
background: oklch(65% 0.2 29); /* 红色 */ background-position: center;
} background-repeat: no-repeat;
background-size: contain;
body.modal-open .toast-info {
background: oklch(65% 0.2 256); /* 蓝色 */
} }
/* 不同类型的toast样式 */
.toast-success { .toast-success {
border-left: 4px solid #4caf50; border-left: 4px solid oklch(65% 0.2 142);
}
.toast-success::before {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%234caf50'%3E%3Cpath d='M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z'/%3E%3C/svg%3E");
} }
.toast-error { .toast-error {
border-left: 4px solid #f44336; border-left: 4px solid oklch(65% 0.2 29);
}
.toast-error::before {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23f44336'%3E%3Cpath d='M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z'/%3E%3C/svg%3E");
} }
.toast-info { .toast-info {
border-left: 4px solid #2196f3; border-left: 4px solid oklch(65% 0.2 256);
}
.toast-info::before {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%232196f3'%3E%3Cpath d='M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z'/%3E%3C/svg%3E");
}
/* 多个toast堆叠显示 */
.toast + .toast {
margin-top: 10px;
}
/* 响应式调整 */
@media (max-width: 768px) {
.toast {
width: calc(100% - 40px); /* 左右各留20px间距 */
max-width: none;
right: 20px;
}
} }
/* Ensure toasts are visible in both themes */ /* Ensure toasts are visible in both themes */

View File

@@ -33,17 +33,13 @@ export function createLoraCard(lora) {
<div class="card-actions"> <div class="card-actions">
<i class="fas fa-globe" <i class="fas fa-globe"
title="${lora.from_civitai ? 'View on Civitai' : 'Not available from Civitai'}" title="${lora.from_civitai ? 'View on Civitai' : 'Not available from Civitai'}"
${lora.from_civitai ? ${!lora.from_civitai ? 'style="opacity: 0.5; cursor: not-allowed"' : ''}>
`onclick="event.stopPropagation(); openCivitai('${lora.model_name}')"` :
'style="opacity: 0.5; cursor: not-allowed"'}>
</i> </i>
<i class="fas fa-copy" <i class="fas fa-copy"
title="Copy Model Name" title="Copy Model Name">
onclick="event.stopPropagation(); navigator.clipboard.writeText('${lora.file_name}').then(() => showToast('Model name copied', 'success')).catch(() => showToast('Copy failed', 'error'))">
</i> </i>
<i class="fas fa-trash" <i class="fas fa-trash"
title="Delete Model" title="Delete Model">
onclick="event.stopPropagation(); deleteModel('${lora.file_path}')">
</i> </i>
</div> </div>
</div> </div>
@@ -53,14 +49,14 @@ export function createLoraCard(lora) {
</div> </div>
<div class="card-actions"> <div class="card-actions">
<i class="fas fa-image" <i class="fas fa-image"
title="Replace Preview Image" title="Replace Preview Image">
onclick="event.stopPropagation(); replacePreview('${lora.file_path}')">
</i> </i>
</div> </div>
</div> </div>
</div> </div>
`; `;
// Main card click event
card.addEventListener('click', () => { card.addEventListener('click', () => {
const meta = JSON.parse(card.dataset.meta || '{}'); const meta = JSON.parse(card.dataset.meta || '{}');
if (Object.keys(meta).length) { if (Object.keys(meta).length) {
@@ -75,6 +71,34 @@ export function createLoraCard(lora) {
} }
}); });
// Copy button click event
card.querySelector('.fa-copy')?.addEventListener('click', e => {
e.stopPropagation();
navigator.clipboard.writeText(card.dataset.file_name)
.then(() => showToast('Model name copied', 'success'))
.catch(() => showToast('Copy failed', 'error'));
});
// Civitai button click event
if (lora.from_civitai) {
card.querySelector('.fa-globe')?.addEventListener('click', e => {
e.stopPropagation();
openCivitai(lora.model_name);
});
}
// Delete button click event
card.querySelector('.fa-trash')?.addEventListener('click', e => {
e.stopPropagation();
deleteModel(lora.file_path);
});
// Replace preview button click event
card.querySelector('.fa-image')?.addEventListener('click', e => {
e.stopPropagation();
replacePreview(lora.file_path);
});
return card; return card;
} }
@@ -140,46 +164,4 @@ export function showLoraModal(lora) {
`; `;
modalManager.showModal('loraModal', content); modalManager.showModal('loraModal', content);
document.querySelectorAll('.trigger-category').forEach(category => {
category.addEventListener('click', function() {
const categoryName = this.dataset.category;
document.querySelectorAll('.trigger-category').forEach(c => c.classList.remove('active'));
this.classList.add('active');
const wordsList = document.querySelector('.trigger-words-list');
wordsList.innerHTML = categories[categoryName].map(word => `
<div class="trigger-word-tag" onclick="copyTriggerWord('${word}')">
<span class="trigger-word-content">${word}</span>
<span class="trigger-word-copy">
<svg width="14" height="14" viewBox="0 0 24 24">
<path fill="currentColor" d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>
</svg>
</span>
</div>
`).join('');
});
});
}
export function initializeLoraCards() {
document.querySelectorAll('.lora-card').forEach(card => {
card.addEventListener('click', () => {
const meta = JSON.parse(card.dataset.meta || '{}');
if (Object.keys(meta).length) {
showLoraModal(meta);
} else {
showToast(card.dataset.from_civitai === 'True'
? 'Click "Fetch" to retrieve metadata'
: 'No CivitAI information available', 'info');
}
});
card.querySelector('.fa-copy')?.addEventListener('click', e => {
e.stopPropagation();
navigator.clipboard.writeText(card.dataset.file_name)
.then(() => showToast('Model name copied', 'success'))
.catch(() => showToast('Copy failed', 'error'));
});
});
} }

View File

@@ -2,7 +2,7 @@ import { debounce } from './utils/debounce.js';
import { LoadingManager } from './managers/LoadingManager.js'; import { LoadingManager } from './managers/LoadingManager.js';
import { modalManager } from './managers/ModalManager.js'; import { modalManager } from './managers/ModalManager.js';
import { state } from './state/index.js'; import { state } from './state/index.js';
import { showLoraModal, initializeLoraCards } from './components/LoraCard.js'; import { showLoraModal } from './components/LoraCard.js';
import { loadMoreLoras, fetchCivitai, deleteModel, replacePreview, resetAndReload, refreshLoras } from './api/loraApi.js'; import { loadMoreLoras, fetchCivitai, deleteModel, replacePreview, resetAndReload, refreshLoras } from './api/loraApi.js';
import { showToast, lazyLoadImages, restoreFolderFilter, initTheme, toggleTheme, toggleFolder, copyTriggerWord, openCivitai } from './utils/uiHelpers.js'; import { showToast, lazyLoadImages, restoreFolderFilter, initTheme, toggleTheme, toggleFolder, copyTriggerWord, openCivitai } from './utils/uiHelpers.js';
import { initializeInfiniteScroll } from './utils/infiniteScroll.js'; import { initializeInfiniteScroll } from './utils/infiniteScroll.js';
@@ -34,7 +34,6 @@ document.addEventListener('DOMContentLoaded', () => {
initializeEventListeners(); initializeEventListeners();
lazyLoadImages(); lazyLoadImages();
restoreFolderFilter(); restoreFolderFilter();
initializeLoraCards();
initTheme(); initTheme();
window.searchManager = new SearchManager(); window.searchManager = new SearchManager();
}); });

View File

@@ -66,18 +66,7 @@ export function toggleFolder(tag) {
export function copyTriggerWord(word) { export function copyTriggerWord(word) {
navigator.clipboard.writeText(word).then(() => { navigator.clipboard.writeText(word).then(() => {
const toast = document.createElement('div'); showToast('Trigger word copied', 'success');
toast.className = 'toast toast-copy';
toast.textContent = 'Copied!';
document.body.appendChild(toast);
requestAnimationFrame(() => {
toast.classList.add('show');
setTimeout(() => {
toast.classList.remove('show');
setTimeout(() => toast.remove(), 300);
}, 1000);
});
}); });
} }