alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-24 22:52:12 -03:00
Code Issues Packages Projects Releases Wiki Activity

feat: implement various UI helpers including clipboard, toasts, theme toggling, and Civitai integration, and add RecipeModal component.

Browse Source
This commit is contained in:
Will Miao
2025-12-29 16:14:55 +08:00
parent 5d5a2a998a
commit d30c8e13df
2 changed files with 440 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
static/js/components/RecipeModal.js
View File

@@ -1,5 +1,5 @@
// Recipe Modal Component // Recipe Modal Component
import { showToast, copyToClipboard, sendModelPathToWorkflow } from '../utils/uiHelpers.js'; import { showToast, copyToClipboard, sendModelPathToWorkflow, openCivitaiByMetadata } from '../utils/uiHelpers.js';
import { translate } from '../utils/i18nHelpers.js'; import { translate } from '../utils/i18nHelpers.js';
import { state } from '../state/index.js'; import { state } from '../state/index.js';
import { setSessionItem, removeSessionItem } from '../utils/storageHelpers.js'; import { setSessionItem, removeSessionItem } from '../utils/storageHelpers.js';
@@ -221,8 +221,8 @@ class RecipeModal {
if (modalImage) { if (modalImage) {
// Ensure file_url exists, fallback to file_path if needed // Ensure file_url exists, fallback to file_path if needed
const imageUrl = recipe.file_url || const imageUrl = recipe.file_url ||
(recipe.file_path ? `/loras_static/root1/preview/${recipe.file_path.split('/').pop()}` : (recipe.file_path ? `/loras_static/root1/preview/${recipe.file_path.split('/').pop()}` :
'/loras_static/images/no-preview.png'); '/loras_static/images/no-preview.png');
// Check if the file is a video (mp4) // Check if the file is a video (mp4)
const isVideo = imageUrl.toLowerCase().endsWith('.mp4'); const isVideo = imageUrl.toLowerCase().endsWith('.mp4');
@@ -261,9 +261,8 @@ class RecipeModal {
sourceUrlContainer.innerHTML = ` sourceUrlContainer.innerHTML = `
<div class="source-url-content"> <div class="source-url-content">
<span class="source-url-icon"><i class="fas fa-link"></i></span> <span class="source-url-icon"><i class="fas fa-link"></i></span>
<span class="source-url-text" title="${isValidUrl ? 'Click to open source URL' : 'No valid URL'}">${ <span class="source-url-text" title="${isValidUrl ? 'Click to open source URL' : 'No valid URL'}">${hasSourceUrl ? sourceUrl : 'No source URL'
hasSourceUrl ? sourceUrl : 'No source URL' }</span>
}</span>
</div> </div>
<button class="source-url-edit-btn" title="Edit source URL"> <button class="source-url-edit-btn" title="Edit source URL">
<i class="fas fa-pencil-alt"></i> <i class="fas fa-pencil-alt"></i>
@@ -743,8 +742,8 @@ class RecipeModal {
// Update source URL in the UI // Update source URL in the UI
sourceUrlText.textContent = newSourceUrl || 'No source URL'; sourceUrlText.textContent = newSourceUrl || 'No source URL';
sourceUrlText.title = newSourceUrl && (newSourceUrl.startsWith('http://') || sourceUrlText.title = newSourceUrl && (newSourceUrl.startsWith('http://') ||
newSourceUrl.startsWith('https://')) ? newSourceUrl.startsWith('https://')) ?
'Click to open source URL' : 'No valid URL'; 'Click to open source URL' : 'No valid URL';
// Update the current recipe object // Update the current recipe object
this.currentRecipe.source_path = newSourceUrl; this.currentRecipe.source_path = newSourceUrl;
@@ -1249,6 +1248,17 @@ class RecipeModal {
} }
navigateToCheckpointPage(checkpoint) { navigateToCheckpointPage(checkpoint) {
if (!checkpoint.inLibrary) {
const modelId = checkpoint.modelId || checkpoint.modelID || checkpoint.model_id;
const versionId = checkpoint.id || checkpoint.modelVersionId;
const modelName = checkpoint.name || checkpoint.modelName || checkpoint.file_name;
if (modelId || modelName) {
openCivitaiByMetadata(modelId, versionId, modelName);
return;
}
}
const checkpointHash = this._getCheckpointHash(checkpoint); const checkpointHash = this._getCheckpointHash(checkpoint);
if (!checkpointHash) { if (!checkpointHash) {
@@ -1296,6 +1306,18 @@ class RecipeModal {
if (specificLoraIndex !== null) { if (specificLoraIndex !== null) {
// If a specific LoRA index is provided, navigate to view just that one LoRA // If a specific LoRA index is provided, navigate to view just that one LoRA
const lora = this.currentRecipe.loras[specificLoraIndex]; const lora = this.currentRecipe.loras[specificLoraIndex];
if (lora && !lora.inLibrary) {
const modelId = lora.modelId || lora.modelID || lora.model_id;
const versionId = lora.id || lora.modelVersionId;
const modelName = lora.modelName || lora.name || lora.file_name;
if (modelId || modelName) {
openCivitaiByMetadata(modelId, versionId, modelName);
return;
}
}
if (lora && lora.hash) { if (lora && lora.hash) {
// Set session storage to open the LoRA modal directly // Set session storage to open the LoRA modal directly
setSessionItem('recipe_to_lora_filterLoraHash', lora.hash.toLowerCase()); setSessionItem('recipe_to_lora_filterLoraHash', lora.hash.toLowerCase());

408
static/js/utils/uiHelpers.js
View File

@@ -16,192 +16,196 @@ import { eventManager } from './EventManager.js';
* @returns {Promise<boolean>} - Promise that resolves to true if copy was successful * @returns {Promise<boolean>} - Promise that resolves to true if copy was successful
*/ */
export async function copyToClipboard(text, successMessage = null) { export async function copyToClipboard(text, successMessage = null) {
const defaultSuccessMessage = successMessage || translate('uiHelpers.clipboard.copied', {}, 'Copied to clipboard'); const defaultSuccessMessage = successMessage || translate('uiHelpers.clipboard.copied', {}, 'Copied to clipboard');
try { try {
// Modern clipboard API // Modern clipboard API
if (navigator.clipboard && window.isSecureContext) { if (navigator.clipboard && window.isSecureContext) {
await navigator.clipboard.writeText(text); await navigator.clipboard.writeText(text);
} else { } else {
// Fallback for older browsers // Fallback for older browsers
const textarea = document.createElement('textarea'); const textarea = document.createElement('textarea');
textarea.value = text; textarea.value = text;
textarea.style.position = 'absolute'; textarea.style.position = 'absolute';
textarea.style.left = '-99999px'; textarea.style.left = '-99999px';
document.body.appendChild(textarea); document.body.appendChild(textarea);
textarea.select(); textarea.select();
document.execCommand('copy'); document.execCommand('copy');
document.body.removeChild(textarea); document.body.removeChild(textarea);
}
if (defaultSuccessMessage) {
showToast('uiHelpers.clipboard.copied', {}, 'success');
}
return true;
} catch (err) {
console.error('Copy failed:', err);
showToast('uiHelpers.clipboard.copyFailed', {}, 'error');
return false;
} }
if (defaultSuccessMessage) {
showToast('uiHelpers.clipboard.copied', {}, 'success');
}
return true;
} catch (err) {
console.error('Copy failed:', err);
showToast('uiHelpers.clipboard.copyFailed', {}, 'error');
return false;
}
} }
export function showToast(key, params = {}, type = 'info', fallback = null) { export function showToast(key, params = {}, type = 'info', fallback = null) {
const message = translate(key, params, fallback); const message = translate(key, params, fallback);
const toast = document.createElement('div'); const toast = document.createElement('div');
toast.className = `toast toast-${type}`; toast.className = `toast toast-${type}`;
toast.textContent = message; toast.textContent = message;
// Get or create toast container // Get or create toast container
let toastContainer = document.querySelector('.toast-container'); let toastContainer = document.querySelector('.toast-container');
if (!toastContainer) { if (!toastContainer) {
toastContainer = document.createElement('div'); toastContainer = document.createElement('div');
toastContainer.className = 'toast-container'; toastContainer.className = 'toast-container';
document.body.append(toastContainer); document.body.append(toastContainer);
}
toastContainer.append(toast);
// Calculate vertical position for stacked toasts
const existingToasts = Array.from(toastContainer.querySelectorAll('.toast'));
const toastIndex = existingToasts.indexOf(toast);
const topOffset = 20; // Base offset from top
const spacing = 10; // Space between toasts
// Set position based on existing toasts
toast.style.top = `${topOffset + (toastIndex * (toast.offsetHeight || 60 + spacing))}px`;
requestAnimationFrame(() => {
toast.classList.add('show');
// Set timeout based on type
let timeout = 2000; // Default (info)
if (type === 'warning' || type === 'error') {
timeout = 5000;
} }
toastContainer.append(toast); setTimeout(() => {
toast.classList.remove('show');
toast.addEventListener('transitionend', () => {
toast.remove();
// Calculate vertical position for stacked toasts // Reposition remaining toasts
const existingToasts = Array.from(toastContainer.querySelectorAll('.toast')); if (toastContainer) {
const toastIndex = existingToasts.indexOf(toast); const remainingToasts = Array.from(toastContainer.querySelectorAll('.toast'));
const topOffset = 20; // Base offset from top remainingToasts.forEach((t, index) => {
const spacing = 10; // Space between toasts t.style.top = `${topOffset + (index * (t.offsetHeight || 60 + spacing))}px`;
});
// Set position based on existing toasts // Remove container if empty
toast.style.top = `${topOffset + (toastIndex * (toast.offsetHeight || 60 + spacing))}px`; if (remainingToasts.length === 0) {
toastContainer.remove();
requestAnimationFrame(() => { }
toast.classList.add('show');
// Set timeout based on type
let timeout = 2000; // Default (info)
if (type === 'warning' || type === 'error') {
timeout = 5000;
} }
});
setTimeout(() => { }, timeout);
toast.classList.remove('show'); });
toast.addEventListener('transitionend', () => {
toast.remove();
// Reposition remaining toasts
if (toastContainer) {
const remainingToasts = Array.from(toastContainer.querySelectorAll('.toast'));
remainingToasts.forEach((t, index) => {
t.style.top = `${topOffset + (index * (t.offsetHeight || 60 + spacing))}px`;
});
// Remove container if empty
if (remainingToasts.length === 0) {
toastContainer.remove();
}
}
});
}, timeout);
});
} }
export function restoreFolderFilter() { export function restoreFolderFilter() {
const activeFolder = getStorageItem('activeFolder'); const activeFolder = getStorageItem('activeFolder');
const folderTag = activeFolder && document.querySelector(`.tag[data-folder="${activeFolder}"]`); const folderTag = activeFolder && document.querySelector(`.tag[data-folder="${activeFolder}"]`);
if (folderTag) { if (folderTag) {
folderTag.classList.add('active'); folderTag.classList.add('active');
filterByFolder(activeFolder); filterByFolder(activeFolder);
} }
} }
export function initTheme() { export function initTheme() {
const savedTheme = getStorageItem('theme') || 'auto'; const savedTheme = getStorageItem('theme') || 'auto';
applyTheme(savedTheme); applyTheme(savedTheme);
// Update theme when system preference changes (for 'auto' mode) // Update theme when system preference changes (for 'auto' mode)
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
const currentTheme = getStorageItem('theme') || 'auto'; const currentTheme = getStorageItem('theme') || 'auto';
if (currentTheme === 'auto') { if (currentTheme === 'auto') {
applyTheme('auto'); applyTheme('auto');
} }
}); });
} }
export function toggleTheme() { export function toggleTheme() {
const currentTheme = getStorageItem('theme') || 'auto'; const currentTheme = getStorageItem('theme') || 'auto';
let newTheme; let newTheme;
if (currentTheme === 'light') { if (currentTheme === 'light') {
newTheme = 'dark'; newTheme = 'dark';
} else { } else {
newTheme = 'light'; newTheme = 'light';
} }
setStorageItem('theme', newTheme); setStorageItem('theme', newTheme);
applyTheme(newTheme); applyTheme(newTheme);
// Force a repaint to ensure theme changes are applied immediately // Force a repaint to ensure theme changes are applied immediately
document.body.style.display = 'none'; document.body.style.display = 'none';
document.body.offsetHeight; // Trigger a reflow document.body.offsetHeight; // Trigger a reflow
document.body.style.display = ''; document.body.style.display = '';
return newTheme; return newTheme;
} }
// Add a new helper function to apply the theme // Add a new helper function to apply the theme
function applyTheme(theme) { function applyTheme(theme) {
const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches; const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
const htmlElement = document.documentElement; const htmlElement = document.documentElement;
// Remove any existing theme attributes // Remove any existing theme attributes
htmlElement.removeAttribute('data-theme'); htmlElement.removeAttribute('data-theme');
// Apply the appropriate theme // Apply the appropriate theme
if (theme === 'dark' || (theme === 'auto' && prefersDark)) { if (theme === 'dark' || (theme === 'auto' && prefersDark)) {
htmlElement.setAttribute('data-theme', 'dark'); htmlElement.setAttribute('data-theme', 'dark');
document.body.dataset.theme = 'dark'; document.body.dataset.theme = 'dark';
} else { } else {
htmlElement.setAttribute('data-theme', 'light'); htmlElement.setAttribute('data-theme', 'light');
document.body.dataset.theme = 'light'; document.body.dataset.theme = 'light';
} }
// Update the theme-toggle icon state // Update the theme-toggle icon state
updateThemeToggleIcons(theme); updateThemeToggleIcons(theme);
} }
// New function to update theme toggle icons // New function to update theme toggle icons
function updateThemeToggleIcons(theme) { function updateThemeToggleIcons(theme) {
const themeToggle = document.querySelector('.theme-toggle'); const themeToggle = document.querySelector('.theme-toggle');
if (!themeToggle) return; if (!themeToggle) return;
// Remove any existing active classes // Remove any existing active classes
themeToggle.classList.remove('theme-light', 'theme-dark', 'theme-auto'); themeToggle.classList.remove('theme-light', 'theme-dark', 'theme-auto');
// Add the appropriate class based on current theme // Add the appropriate class based on current theme
themeToggle.classList.add(`theme-${theme}`); themeToggle.classList.add(`theme-${theme}`);
} }
function filterByFolder(folderPath) { function filterByFolder(folderPath) {
document.querySelectorAll('.model-card').forEach(card => { document.querySelectorAll('.model-card').forEach(card => {
card.style.display = card.dataset.folder === folderPath ? '' : 'none'; card.style.display = card.dataset.folder === folderPath ? '' : 'none';
}); });
}
export function openCivitaiByMetadata(civitaiId, versionId, modelName = null) {
if (civitaiId) {
let url = `https://civitai.com/models/${civitaiId}`;
if (versionId) {
url += `?modelVersionId=${versionId}`;
}
window.open(url, '_blank');
} else if (modelName) {
// 如果没有ID，尝试使用名称搜索
window.open(`https://civitai.com/models?query=${encodeURIComponent(modelName)}`, '_blank');
}
} }
export function openCivitai(filePath) { export function openCivitai(filePath) {
const loraCard = document.querySelector(`.model-card[data-filepath="${filePath}"]`); const loraCard = document.querySelector(`.model-card[data-filepath="${filePath}"]`);
if (!loraCard) return; if (!loraCard) return;
const metaData = JSON.parse(loraCard.dataset.meta); const metaData = JSON.parse(loraCard.dataset.meta);
const civitaiId = metaData.modelId; const civitaiId = metaData.modelId;
const versionId = metaData.id; const versionId = metaData.id;
const modelName = loraCard.dataset.name;
if (civitaiId) { openCivitaiByMetadata(civitaiId, versionId, modelName);
let url = `https://civitai.com/models/${civitaiId}`;
if (versionId) {
url += `?modelVersionId=${versionId}`;
}
window.open(url, '_blank');
} else {
// 如果没有ID，尝试使用名称搜索
const modelName = loraCard.dataset.name;
window.open(`https://civitai.com/models?query=${encodeURIComponent(modelName)}`, '_blank');
}
} }
/** /**
@@ -209,90 +213,90 @@ export function openCivitai(filePath) {
* based on the current layout and folder tags container height * based on the current layout and folder tags container height
*/ */
export function updatePanelPositions() { export function updatePanelPositions() {
const searchOptionsPanel = document.getElementById('searchOptionsPanel'); const searchOptionsPanel = document.getElementById('searchOptionsPanel');
const filterPanel = document.getElementById('filterPanel'); const filterPanel = document.getElementById('filterPanel');
if (!searchOptionsPanel && !filterPanel) return; if (!searchOptionsPanel && !filterPanel) return;
// Get the header element // Get the header element
const header = document.querySelector('.app-header'); const header = document.querySelector('.app-header');
if (!header) return; if (!header) return;
// Calculate the position based on the bottom of the header // Calculate the position based on the bottom of the header
const headerRect = header.getBoundingClientRect(); const headerRect = header.getBoundingClientRect();
const topPosition = headerRect.bottom + 5; // Add 5px padding const topPosition = headerRect.bottom + 5; // Add 5px padding
// Set the positions // Set the positions
if (searchOptionsPanel) {
searchOptionsPanel.style.top = `${topPosition}px`;
}
if (filterPanel) {
filterPanel.style.top = `${topPosition}px`;
}
// Adjust panel horizontal position based on the search container
const searchContainer = document.querySelector('.header-search');
if (searchContainer) {
const searchRect = searchContainer.getBoundingClientRect();
// Position the search options panel aligned with the search container
if (searchOptionsPanel) { if (searchOptionsPanel) {
searchOptionsPanel.style.top = `${topPosition}px`; searchOptionsPanel.style.right = `${window.innerWidth - searchRect.right}px`;
} }
// Position the filter panel aligned with the filter button
if (filterPanel) { if (filterPanel) {
filterPanel.style.top = `${topPosition}px`; const filterButton = document.getElementById('filterButton');
} if (filterButton) {
const filterRect = filterButton.getBoundingClientRect();
// Adjust panel horizontal position based on the search container filterPanel.style.right = `${window.innerWidth - filterRect.right}px`;
const searchContainer = document.querySelector('.header-search');
if (searchContainer) {
const searchRect = searchContainer.getBoundingClientRect();
// Position the search options panel aligned with the search container
if (searchOptionsPanel) {
searchOptionsPanel.style.right = `${window.innerWidth - searchRect.right}px`;
}
// Position the filter panel aligned with the filter button
if (filterPanel) {
const filterButton = document.getElementById('filterButton');
if (filterButton) {
const filterRect = filterButton.getBoundingClientRect();
filterPanel.style.right = `${window.innerWidth - filterRect.right}px`;
}
} }
} }
}
} }
export function initBackToTop() { export function initBackToTop() {
const button = document.getElementById('backToTopBtn'); const button = document.getElementById('backToTopBtn');
if (!button) return; if (!button) return;
// Get the scrollable container // Get the scrollable container
const scrollContainer = document.querySelector('.page-content'); const scrollContainer = document.querySelector('.page-content');
// Show/hide button based on scroll position // Show/hide button based on scroll position
const toggleBackToTop = () => { const toggleBackToTop = () => {
const scrollThreshold = window.innerHeight * 0.3; const scrollThreshold = window.innerHeight * 0.3;
if (scrollContainer.scrollTop > scrollThreshold) { if (scrollContainer.scrollTop > scrollThreshold) {
button.classList.add('visible'); button.classList.add('visible');
} else { } else {
button.classList.remove('visible'); button.classList.remove('visible');
} }
}; };
// Smooth scroll to top // Smooth scroll to top
button.addEventListener('click', () => { button.addEventListener('click', () => {
scrollContainer.scrollTo({ scrollContainer.scrollTo({
top: 0, top: 0,
behavior: 'smooth' behavior: 'smooth'
});
}); });
});
// Listen for scroll events on the scrollable container // Listen for scroll events on the scrollable container
scrollContainer.addEventListener('scroll', toggleBackToTop); scrollContainer.addEventListener('scroll', toggleBackToTop);
// Initial check // Initial check
toggleBackToTop(); toggleBackToTop();
} }
export function getNSFWLevelName(level) { export function getNSFWLevelName(level) {
if (level === 0) return 'Unknown'; if (level === 0) return 'Unknown';
if (level >= 32) return 'Blocked'; if (level >= 32) return 'Blocked';
if (level >= 16) return 'XXX'; if (level >= 16) return 'XXX';
if (level >= 8) return 'X'; if (level >= 8) return 'X';
if (level >= 4) return 'R'; if (level >= 4) return 'R';
if (level >= 2) return 'PG13'; if (level >= 2) return 'PG13';
if (level >= 1) return 'PG'; if (level >= 1) return 'PG';
return 'Unknown'; return 'Unknown';
} }
function parseUsageTipNumber(value) { function parseUsageTipNumber(value) {