Merge branch 'main' of https://git.ambigrat.com/hom/yuanhe-checkin-electron
This commit is contained in:
@@ -300,16 +300,18 @@ ipcMain.handle("print-pdf", async (event, pdfDataOrUrl, printOptions = {}) => {
|
||||
throw new Error(`PDF文件大小异常(${stats.size} bytes),可能文件损坏`);
|
||||
}
|
||||
|
||||
const duplexMode = printOptions?.duplex;
|
||||
log.info(
|
||||
`准备打印PDF: ${pdfFilePath}, 打印机: ${
|
||||
targetPrinterName || "默认打印机"
|
||||
}`
|
||||
}, 双面打印: ${duplexMode ? "是" : "否"}`
|
||||
);
|
||||
|
||||
// 使用 pdf-to-printer 打印
|
||||
const printOptions_ptp = {
|
||||
printer: targetPrinterName || undefined,
|
||||
silent: true, // 静默打印
|
||||
duplex: duplexMode || false, // 双面打印选项
|
||||
};
|
||||
|
||||
await ptp.print(pdfFilePath, printOptions_ptp);
|
||||
|
||||
32
src/components/DuplexToggle.css
Normal file
32
src/components/DuplexToggle.css
Normal file
@@ -0,0 +1,32 @@
|
||||
.duplex-toggle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
gap: 10px;
|
||||
transition: opacity 0.2s ease;
|
||||
}
|
||||
|
||||
.duplex-toggle:hover {
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.duplex-toggle-icon {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 4px;
|
||||
font-size: 16px;
|
||||
transition: all 0.2s ease;
|
||||
flex-shrink: 0;
|
||||
font-family: NotoSansCJKsc-Medium;
|
||||
}
|
||||
|
||||
|
||||
.duplex-toggle-label {
|
||||
font-size: 20px;
|
||||
font-family: NotoSansCJKsc-Regular;
|
||||
color: rgba(0, 45, 93, 1);
|
||||
}
|
||||
30
src/components/DuplexToggle.tsx
Normal file
30
src/components/DuplexToggle.tsx
Normal file
@@ -0,0 +1,30 @@
|
||||
import React from "react";
|
||||
import "./DuplexToggle.css";
|
||||
|
||||
interface DuplexToggleProps {
|
||||
checked: boolean;
|
||||
onChange: (checked: boolean) => void;
|
||||
label?: string;
|
||||
}
|
||||
|
||||
const DuplexToggle: React.FC<DuplexToggleProps> = ({
|
||||
checked,
|
||||
onChange,
|
||||
label = "",
|
||||
}) => {
|
||||
const handleClick = () => {
|
||||
onChange(!checked);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="duplex-toggle" onClick={handleClick}>
|
||||
<div className={`duplex-toggle-icon ${checked ? "checked" : "unchecked"}`}>
|
||||
{checked ? "双" : "单"}
|
||||
</div>
|
||||
<span className="duplex-toggle-label">{label}</span>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default DuplexToggle;
|
||||
|
||||
2
src/electron.d.ts
vendored
2
src/electron.d.ts
vendored
@@ -14,7 +14,7 @@ interface ElectronAPI {
|
||||
) => Promise<{ success: boolean; data?: string; error?: string }>;
|
||||
printPdf: (
|
||||
pdfUrl: string,
|
||||
options?: { printerName?: string }
|
||||
options?: { printerName?: string; duplex?: boolean }
|
||||
) => Promise<{ success: boolean; error?: string }>;
|
||||
getPrinters: () => Promise<{
|
||||
success: boolean;
|
||||
|
||||
@@ -348,4 +348,11 @@
|
||||
.ui8-printer-error {
|
||||
font-size: 22px;
|
||||
color: #b12651;
|
||||
}
|
||||
|
||||
.ui8-duplex-option {
|
||||
margin-top: 15px;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
@@ -5,11 +5,13 @@ import "./UI8.css";
|
||||
import "../../assets/css/basic.css";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import ConfirmButton from "../../components/ConfirmButton";
|
||||
import DuplexToggle from "../../components/DuplexToggle";
|
||||
import ui8A from "../../assets/ui8A.png";
|
||||
import ui8B from "../../assets/ui8B.png";
|
||||
import { getDaojiandanPdf } from "../../api/hisApi";
|
||||
|
||||
const PREFERRED_PRINTER_KEY = "preferredPrinterName";
|
||||
const PREFERRED_DUPLEX_KEY = "preferredDuplex";
|
||||
|
||||
type PrinterInfo = ElectronPrinterInfo;
|
||||
|
||||
@@ -74,6 +76,7 @@ const UI8: React.FC = () => {
|
||||
const printerDropdownRef = useRef<HTMLDivElement | null>(null);
|
||||
const pdfContainerRef = useRef<HTMLDivElement | null>(null);
|
||||
const [isRightSectionHidden, setIsRightSectionHidden] = useState(false);
|
||||
const [duplexEnabled, setDuplexEnabled] = useState<boolean>(false);
|
||||
|
||||
const getExamId = () => {
|
||||
const storedId = localStorage.getItem("selectedExamId");
|
||||
@@ -221,6 +224,12 @@ const UI8: React.FC = () => {
|
||||
|
||||
fetchPrinters();
|
||||
|
||||
// 恢复双面打印设置
|
||||
const storedDuplex = localStorage.getItem(PREFERRED_DUPLEX_KEY);
|
||||
if (storedDuplex === "true") {
|
||||
setDuplexEnabled(true);
|
||||
}
|
||||
|
||||
return () => {
|
||||
isMounted = false;
|
||||
};
|
||||
@@ -343,7 +352,10 @@ const UI8: React.FC = () => {
|
||||
|
||||
const printResult = await window.electronAPI.printPdf(
|
||||
printData,
|
||||
selectedPrinter ? { printerName: selectedPrinter } : undefined
|
||||
{
|
||||
...(selectedPrinter ? { printerName: selectedPrinter } : {}),
|
||||
duplex: duplexEnabled,
|
||||
}
|
||||
);
|
||||
|
||||
if (!printResult.success) {
|
||||
@@ -363,7 +375,7 @@ const UI8: React.FC = () => {
|
||||
} finally {
|
||||
setIsPrinting(false);
|
||||
}
|
||||
}, [originPdfUrls, pdfFiles, printers.length, selectedPrinter, navigate, isPrinting]);
|
||||
}, [originPdfUrls, pdfFiles, printers.length, selectedPrinter, navigate, isPrinting, duplexEnabled]);
|
||||
|
||||
const handlePageCountUpdate = useCallback((index: number, numPages: number) => {
|
||||
window.electronAPI?.log("info", `[UI8] PDF渲染成功 (index=${index}),共 ${numPages} 页`);
|
||||
@@ -399,6 +411,17 @@ const UI8: React.FC = () => {
|
||||
}
|
||||
}}
|
||||
>
|
||||
<DuplexToggle
|
||||
checked={duplexEnabled}
|
||||
onChange={(enabled) => {
|
||||
setDuplexEnabled(enabled);
|
||||
localStorage.setItem(PREFERRED_DUPLEX_KEY, enabled.toString());
|
||||
window.electronAPI?.log(
|
||||
"info",
|
||||
`[UI8] 双面打印设置为: ${enabled ? "启用" : "禁用"}`
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<span>
|
||||
{printersLoading
|
||||
? "打印机加载中..."
|
||||
@@ -436,6 +459,7 @@ const UI8: React.FC = () => {
|
||||
{printerError && (
|
||||
<div className="ui8-printer-error">{printerError}</div>
|
||||
)}
|
||||
|
||||
</div>
|
||||
|
||||
<div className="basic-white-block">
|
||||
|
||||
@@ -27,8 +27,8 @@ const UI9: React.FC = () => {
|
||||
navigate("/");
|
||||
}, [navigate]);
|
||||
|
||||
const [countdown, setCountdown] = useState(30);
|
||||
const [backTime, setBackTime] = useState("确认(30S)");
|
||||
const [countdown, setCountdown] = useState(45);
|
||||
const [backTime, setBackTime] = useState("确认(45S)");
|
||||
|
||||
useEffect(() => {
|
||||
if (countdown > 0) {
|
||||
|
||||
Reference in New Issue
Block a user