UnitPrint/web-app
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add progress print page

Browse Source
This commit is contained in:
TraceLumen
2026-09-17 03:50:12 +03:00
parent a44ff63353
commit 3a949e1099
3 changed files with 566 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/pages/print/PrintMenu.svelte
View File

@ -3,6 +3,7 @@
import { createPrintStore } from './store.svelte.js';
import PrintUI from './PrintUI.svelte';
import PreviewOverlay from './PreviewOverlay.svelte';
import PrintProgress from './PrintProgress.svelte';
import PaymentPage from '$lib/common/ui/PaymentPage.svelte';
import { plFiles, plCopies } from '$lib/common/utils/pricing.util.js';
@ -23,22 +24,22 @@
const hasTierLarge = $derived(store.files.some((f) => (f.selectedPages?.size || 0) >= 1000));
</script>
{#if store.showPayment}
{#if store.job}
<!-- Страница прогресса печати (после оплаты) -->
<PrintProgress {store} onBack={onBack} />
{:else if store.showPayment}
<PaymentPage
totalPrice={store.totalPrice}
filesCount={store.files.length}
onBack={store.hidePayment}
onConfirmPayment={store.submitPrint}
/>
{/if}
{#if !store.activeFile && !store.showPayment}
{:else if !store.activeFile}
<div class="page-container">
<header class="header">
<button class="back-btn" onclick={onBack}>←</button>
<h1>Печать</h1>
</header>
<main class="options">
{#if store.files.length === 0}
<PrintUI as="upload-zone" onSelect={() => fileInput.click()} />
@ -58,7 +59,6 @@
<button class="add-file-btn" onclick={() => fileInput.click()}>＋ Добавить файлы</button>
{/if}
</main>
<PrintUI
as="footer"
totalPrice={store.totalPrice}
@ -72,8 +72,6 @@
plFiles={plFiles}
plCopies={plCopies}
/>
<!-- ✅ Расширенный accept -->
<input
type="file"
bind:this={fileInput}
@ -85,7 +83,9 @@
</div>
{/if}
{#if !store.job}
<PreviewOverlay {store} />
{/if}
<style>
.page-container { width: 100%; min-height: 100dvh; display: flex; flex-direction: column; background: radial-gradient(120% 60% at 50% -10%, rgba(99,102,241,0.18) 0%, transparent 60%); font-family: system-ui, -apple-system, sans-serif; color: #f5f7fa; }

184
src/lib/pages/print/PrintProgress.svelte Normal file
View File

@ -0,0 +1,184 @@
<!-- lib/pages/print/PrintProgress.svelte -->
<script>
const currentStatus = $derived.by(() => {
if (!store.job) return 'idle';
const f = store.job.files.find(f => f.status === 'printing');
if (f) return 'printing';
const q = store.job.files.find(f => f.status === 'queued');
return q ? 'queued' : store.job.phase;
});
let { store, onBack = () => {} } = $props();
const OFFICE_EXT = ['DOC', 'DOCX', 'ODT', 'XLS', 'XLSX', 'ODS', 'PPT', 'PPTX', 'ODP'];
const STATUS_LABEL = {
queued: 'В очереди',
printing: 'Печатается…',
awaiting: 'Далее',
done: 'Готово',
error: 'Ошибка',
cancelled: 'Отменено'
};
function badge(name) {
const e = (name.split('.').pop() || '').toUpperCase();
return OFFICE_EXT.includes(e) ? e : null;
}
// Опрос статуса задания, пока оно активно
$effect(() => {
if (!store.jobActive) return;
const int = setInterval(() => store.refreshJob(), 1000);
return () => clearInterval(int);
});
// ── Отмена удержанием (защита от миссклика) ──
const HOLD_MS = 1500;
let hold = $state(0);
let raf = 0;
let t0 = 0;
function startHold(e) {
if (!store.jobActive) return;
e.preventDefault();
e.currentTarget.setPointerCapture?.(e.pointerId);
t0 = performance.now();
const step = (now) => {
hold = Math.min(1, (now - t0) / HOLD_MS);
if (hold >= 1) {
raf = 0;
hold = 0;
store.cancelJob();
return;
}
raf = requestAnimationFrame(step);
};
raf = requestAnimationFrame(step);
}
function endHold() {
if (raf) cancelAnimationFrame(raf);
raf = 0;
hold = 0;
}
function finish() {
store.resetJob();
onBack();
}
</script>
<div class="page-container">
<header class="header">
<button class="back-btn" disabled={store.jobActive} onclick={finish}>←</button>
<h1>Печать</h1>
</header>
<main class="list">
{#if store.job}
{#each store.job.files as f, i (i + '-' + f.name)}
{@const b = badge(f.name)}
<section class="file-card" class:current={f.status === 'awaiting' || f.status === 'printing'}>
<div class="file-row">
{#if b}<span class="type-badge">{b}</span>{/if}
<span class="file-name" title={f.name}>{f.name}</span>
<span class="file-status st-{f.status}">{STATUS_LABEL[f.status] ?? f.status}</span>
</div>
{#if f.status === 'awaiting'}
<ol class="pickup-hint">
<li>Возьмите верхний листок</li>
<li>Нажмите далее</li>
</ol>
{/if}
{#if f.error}
<p class="file-error">{f.error}</p>
{/if}
</section>
{/each}
{/if}
</main>
<footer class="actions">
<label class="auto-row">
<input
type="checkbox"
checked={store.autoContinue}
onchange={(e) => store.setAutoContinue(e.target.checked)}
/>
<span>Автоматически продолжать печать</span>
</label>
{#if store.jobActive}
{#if store.job?.phase === 'awaiting_pickup'}
<button class="next-btn" onclick={store.advanceJob}>Далее</button>
{:else}
<!-- Кнопка видна, но серая и disabled пока сервер не допечатал -->
<button class="next-btn next-btn-disabled" disabled>
{store.currentStatus === 'printing' ? 'Печатается…' : 'Ожидание печати…'}
</button>
{/if}
<button
class="cancel-btn"
onpointerdown={startHold}
onpointerup={endHold}
onpointercancel={endHold}
onpointerleave={endHold}
oncontextmenu={(e) => e.preventDefault()}
>
<span class="cancel-fill" style:width="{hold * 100}%"></span>
<span class="cancel-label">Отмена</span>
</button>
<p class="hold-hint">Удерживайте для отмены печати</p>
{:else}
<button class="home-btn" onclick={finish}>На главную</button>
{/if}
</footer>
</div>
<style>
.page-container { width: 100%; min-height: 100dvh; display: flex; flex-direction: column; background: radial-gradient(120% 60% at 50% -10%, rgba(99,102,241,0.18) 0%, transparent 60%); font-family: system-ui, -apple-system, sans-serif; color: #f5f7fa; }
.header { padding: 24px 20px 8px; display: flex; align-items: center; position: relative; }
.back-btn { background: none; border: none; color: #6366f1; font-size: 15px; font-weight: 600; cursor: pointer; padding: 8px 4px; margin-right: auto; min-height: 44px; }
.back-btn:disabled { opacity: 0.3; cursor: not-allowed; }
.header h1 { margin: 0; font-size: 28px; font-weight: 700; position: absolute; left: 50%; transform: translateX(-50%); white-space: nowrap; }
.list { flex: 1; padding: 24px 20px 16px; display: flex; flex-direction: column; gap: 14px; overflow-y: auto; }
.file-card { border-radius: 16px; background: rgba(255,255,255,0.04); border: 1px solid rgba(255,255,255,0.08); padding: 14px; display: flex; flex-direction: column; gap: 8px; transition: border-color 0.2s ease, background 0.2s ease; }
.file-card.current { border-color: rgba(99,102,241,0.45); background: rgba(99,102,241,0.07); }
.file-row { display: flex; align-items: center; gap: 12px; min-width: 0; }
.file-name { flex: 1; min-width: 0; font-size: 15px; font-weight: 500; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.file-status { flex-shrink: 0; font-size: 14px; font-weight: 700; }
.st-done { color: #22c55e; }
.st-awaiting { color: #fbbf24; }
.st-printing { color: #a5b4fc; }
.st-queued { color: #8b93a1; }
.st-error { color: #ef4444; }
.st-cancelled { color: #6b7280; }
.type-badge { flex-shrink: 0; padding: 3px 7px; border-radius: 6px; background: rgba(99,102,241,0.2); border: 1px solid rgba(99,102,241,0.35); color: #a5b4fc; font-size: 10px; font-weight: 700; letter-spacing: 0.04em; line-height: 1.2; user-select: none; }
.pickup-hint { margin: 0; padding-left: 22px; color: #eab308; font-size: 14px; line-height: 1.6; font-weight: 600; }
.file-error { margin: 0; color: #fca5a5; font-size: 12px; line-height: 1.4; }
.actions { padding: 16px 20px 32px; display: flex; flex-direction: column; gap: 12px; }
.auto-row { display: flex; align-items: center; justify-content: center; gap: 10px; color: #a9b0c0; font-size: 14px; font-weight: 600; user-select: none; cursor: pointer; }
.auto-row input { width: 18px; height: 18px; accent-color: #6366f1; cursor: pointer; }
.next-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #5b8cff 0%, #38c6ff 100%); box-shadow: 0 8px 24px -6px rgba(72,150,255,0.4); }
.next-btn-disabled {
opacity: 0.5;
cursor: wait;
pointer-events: none;
background: linear-gradient(135deg, #475569 0%, #64748b 100%);
box-shadow: none;
}
.cancel-btn { position: relative; overflow: hidden; width: 100%; padding: 16px 24px; border-radius: 16px; border: 1px solid rgba(239,68,68,0.35); background: rgba(239,68,68,0.08); color: #fca5a5; font-size: 16px; font-weight: 700; cursor: pointer; touch-action: none; user-select: none; -webkit-user-select: none; -webkit-touch-callout: none; -webkit-tap-highlight-color: transparent; }
.cancel-fill { position: absolute; left: 0; top: 0; bottom: 0; width: 0%; background: rgba(239,68,68,0.35); pointer-events: none; }
.cancel-label { position: relative; }
.hold-hint { margin: -4px 0 0; text-align: center; color: rgba(139,147,161,0.6); font-size: 11px; }
.home-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #22c55e 0%, #16a34a 100%); box-shadow: 0 8px 24px -6px rgba(34,197,94,0.4); }
</style>

115
src/lib/pages/print/store.svelte.js
View File

@ -1,5 +1,4 @@
// lib/pages/print/store.svelte.js
import { onDestroy, tick } from 'svelte';
import { getPricePerPage } from '$lib/common/utils/pricing.util.js';
import { detectFileType, pagesLabel as _pagesLabel } from '$lib/common/utils/file.util.js';
@ -14,6 +13,8 @@ import { loadPdfDocument, renderPageToImage } from '$lib/common/services/pdf.ser
* dpi: string, totalPages: number,
* selectedPages: Set<number>, pdfDoc: any
* }} FileEntry
* @typedef {{ name: string, status: 'queued'|'printing'|'awaiting'|'done'|'error'|'cancelled', error: (string|null) }} JobFileView
* @typedef {{ job_id: string, phase: 'waiting_start'|'printing'|'awaiting_pickup'|'finished'|'cancelled', files: JobFileView[] }} JobView
*/
export function createPrintStore() {
let files = $state(/** @type {FileEntry[]} */ ([]));
@ -25,6 +26,14 @@ export function createPrintStore() {
let galleryLoading = $state(false);
let previewPagesCache = $state({});
let isPreviewRendering = $state(false);
// ── Задание печати (страница прогресса) ──
let job = $state(/** @type {JobView | null} */ (null));
let autoContinue = $state(false);
let advancing = false;
const jobActive = $derived(!!job && job.phase !== 'finished' && job.phase !== 'cancelled');
let uid = 0;
const totalPrice = $derived(
@ -33,7 +42,6 @@ export function createPrintStore() {
return sum + pages * f.copies * getPricePerPage(pages);
}, 0)
);
const extraCopies = $derived(files.reduce((sum, f) => sum + (f.copies - 1), 0));
function updateFile(id, changes) {
@ -62,16 +70,13 @@ export function createPrintStore() {
async function addFiles(fileList) {
if (!fileList || fileList.length === 0) return;
const newFiles = [];
for (let i = 0; i < fileList.length; i++) {
const file = fileList[i];
const fType = detectFileType(file);
const isOffice = fType === 'office';
newFiles.push({
id: ++uid,
file,
// Для офисных файлов превью не создаём
previewUrl: isOffice ? null : URL.createObjectURL(file),
fileType: fType,
expanded: false,
@ -81,19 +86,14 @@ export function createPrintStore() {
copies: 1,
sides: 'Односторонняя',
dpi: 'Авто',
// Для офисных файлов: 1 «страница» для расчёта цены,
// реальное кол-во определит CUPS
totalPages: (fType === 'image' || isOffice) ? 1 : 0,
selectedPages: (fType === 'image' || isOffice) ? new Set([1]) : new Set(),
pdfDoc: null
});
}
files = [...files, ...newFiles];
for (const entry of newFiles) {
if (entry.fileType === 'pdf') ensurePdfLoaded(entry);
// office и image — ничего дополнительно не загружаем
}
}
@ -102,7 +102,6 @@ export function createPrintStore() {
if (f?.previewUrl) URL.revokeObjectURL(f.previewUrl);
files = files.filter((x) => x.id !== id);
}
function toggleExpand(id) {
updateFile(id, { expanded: !files.find((f) => f.id === id)?.expanded });
}
@ -114,13 +113,11 @@ export function createPrintStore() {
galleryLoading = true;
previewPagesCache = {};
await tick();
const pdf = await ensurePdfLoaded(entry);
if (!pdf || entry.totalPages === 0) {
galleryLoading = false;
return;
}
const thumbs = [];
for (let i = 1; i <= entry.totalPages; i++) {
try {
@ -139,7 +136,6 @@ export function createPrintStore() {
previewPagesCache = {};
galleryThumbnails = [];
await tick();
if (entry.fileType === 'pdf') {
const pdf = await ensurePdfLoaded(entry);
if (pdf && entry.totalPages > 0) {
@ -152,11 +148,9 @@ export function createPrintStore() {
const currentFile = files.find((f) => f.id === entry.id);
const pdf = currentFile?.pdfDoc || entry.pdfDoc;
if (!pdf || isPreviewRendering) return;
isPreviewRendering = true;
const endPage = Math.min(startPage + count - 1, entry.totalPages);
const newCache = {};
for (let i = startPage; i <= endPage; i++) {
if (previewPagesCache[i]) continue;
try {
@ -165,7 +159,6 @@ export function createPrintStore() {
console.error(`Failed to render preview page ${i}`, e);
}
}
if (Object.keys(newCache).length > 0) {
previewPagesCache = { ...previewPagesCache, ...newCache };
}
@ -182,36 +175,31 @@ export function createPrintStore() {
}
updateFile(activeFile.id, { selectedPages: newSet });
}
function selectAllPages() {
if (!activeFile?.totalPages) return;
updateFile(activeFile.id, {
selectedPages: new Set(Array.from({ length: activeFile.totalPages }, (_, i) => i + 1))
});
}
function deselectAllPages() {
if (!activeFile) return;
updateFile(activeFile.id, { selectedPages: new Set([1]) });
}
// ─────────────── Отправка на печать + job-протокол ───────────────
async function submitPrint() {
if (files.length === 0 || isPrinting) return;
isPrinting = true;
const formData = new FormData();
for (const f of files) {
formData.append('files', f.file, f.file.name);
// Для офисных файлов всегда отправляем все страницы —
// CUPS сам разберётся
const pagesValue =
f.fileType === 'office'
? 'all'
: f.selectedPages && f.selectedPages.size > 0
? Array.from(f.selectedPages).sort((a, b) => a - b).join(',')
: 'all';
formData.append(
'settings',
JSON.stringify({
@ -226,17 +214,84 @@ export function createPrintStore() {
})
);
}
try {
const res = await fetch('/api/print', { method: 'POST', body: formData });
const text = await res.text();
alert(res.ok ? `✅ Успешно!\n${text}` : `❌ Ошибка (${res.status}):\n${text}`);
if (!res.ok) {
alert(`❌ Ошибка (${res.status}):\n${text}`);
return;
}
let data;
try {
data = JSON.parse(text);
} catch {
alert('⚠️ Некорректный ответ сервера печати.');
return;
}
job = data;
showPayment = false;
await advanceJob(); // старт первого файла
} catch {
alert('⚠️ Не удалось связаться с сервером печати.');
} finally {
isPrinting = false;
}
}
/** Подтверждение: старт первого файла / «забрал документ → печатай следующий» */
async function advanceJob() {
if (!job || advancing) return;
advancing = true;
try {
const res = await fetch(`/api/print/${job.job_id}/advance`, { method: 'POST' });
if (res.ok) job = await res.json();
} catch (e) {
console.error('advance error:', e);
} finally {
advancing = false;
}
}
/** Поллинг статуса; при autoContinue сами шлём подтверждение */
async function refreshJob() {
if (!job) return;
try {
const res = await fetch(`/api/print/${job.job_id}`);
if (!res.ok) return;
job = await res.json();
if (job.phase === 'waiting_start') {
advanceJob();
} else if (job.phase === 'awaiting_pickup' && autoContinue) {
advanceJob();
}
} catch (e) {
console.error('refresh error:', e);
}
}
async function cancelJob() {
if (!job) return;
try {
const res = await fetch(`/api/print/${job.job_id}/cancel`, { method: 'POST' });
if (res.ok) job = await res.json();
} catch (e) {
console.error('cancel error:', e);
}
}
function resetJob() {
job = null;
autoContinue = false;
files.forEach((f) => f.previewUrl && URL.revokeObjectURL(f.previewUrl));
files = [];
activeFile = null;
galleryThumbnails = [];
previewPagesCache = {};
showPayment = false;
}
function setAutoContinue(v) {
autoContinue = !!v;
}
onDestroy(() => {
@ -255,6 +310,9 @@ export function createPrintStore() {
get galleryLoading() { return galleryLoading; },
get previewPagesCache() { return previewPagesCache; },
get isPreviewRendering() { return isPreviewRendering; },
get job() { return job; },
get jobActive() { return jobActive; },
get autoContinue() { return autoContinue; },
addFiles,
removeFile,
toggleExpand,
@ -265,6 +323,11 @@ export function createPrintStore() {
openPayment: () => { if (files.length > 0 && !isPrinting) showPayment = true; },
hidePayment: () => { showPayment = false; },
submitPrint,
advanceJob,
refreshJob,
cancelJob,
resetJob,
setAutoContinue,
togglePageSelection,
selectAllPages,
deselectAllPages,