Compare commits
No commits in common. "984b8aa1c84a00a28469f01709bd382c0a214d46" and "748f57dd550638dc28714ac60249a31b231d6fd3" have entirely different histories.
984b8aa1c8
...
748f57dd55
|
|
@ -1,7 +1,7 @@
|
||||||
import {createMemo, For} from 'solid-js';
|
import {createMemo, For} from 'solid-js';
|
||||||
import {parseMarkdown} from '../../markdown';
|
import {parseMarkdown} from '../../markdown';
|
||||||
import { getLayerStyle } from './hooks/dimensions';
|
import { getLayerStyle } from './hooks/dimensions';
|
||||||
import type { CardData, CardSide } from './types';
|
import type { CardData } from './types';
|
||||||
import {DeckStore} from "./hooks/deckStore";
|
import {DeckStore} from "./hooks/deckStore";
|
||||||
import {processVariables} from "../utils/csv-loader";
|
import {processVariables} from "../utils/csv-loader";
|
||||||
import {resolvePath} from "../utils/path";
|
import {resolvePath} from "../utils/path";
|
||||||
|
|
@ -9,16 +9,10 @@ import {resolvePath} from "../utils/path";
|
||||||
export interface CardLayerProps {
|
export interface CardLayerProps {
|
||||||
cardData: CardData;
|
cardData: CardData;
|
||||||
store: DeckStore;
|
store: DeckStore;
|
||||||
side?: CardSide;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CardLayer(props: CardLayerProps) {
|
export function CardLayer(props: CardLayerProps) {
|
||||||
const side = () => props.side || 'front';
|
const layers = createMemo(() => props.store.state.layerConfigs.filter((l) => l.visible));
|
||||||
const layers = createMemo(() =>
|
|
||||||
side() === 'front'
|
|
||||||
? props.store.state.frontLayerConfigs.filter((l) => l.visible)
|
|
||||||
: props.store.state.backLayerConfigs.filter((l) => l.visible)
|
|
||||||
);
|
|
||||||
const dimensions = () => props.store.state.dimensions!;
|
const dimensions = () => props.store.state.dimensions!;
|
||||||
const showBounds = () => props.store.state.isEditing;
|
const showBounds = () => props.store.state.isEditing;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,6 @@ export function CardPreview(props: CardPreviewProps) {
|
||||||
<CardLayer
|
<CardLayer
|
||||||
cardData={currentCard()}
|
cardData={currentCard()}
|
||||||
store={store}
|
store={store}
|
||||||
side={store.state.activeSide}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,7 @@ export function PrintPreview(props: PrintPreviewProps) {
|
||||||
const { getA4Size, pages, cropMarks } = usePageLayout(store);
|
const { getA4Size, pages, cropMarks } = usePageLayout(store);
|
||||||
const { exportToPDF } = usePDFExport(store, props.onClose);
|
const { exportToPDF } = usePDFExport(store, props.onClose);
|
||||||
|
|
||||||
const frontVisibleLayers = () => store.state.frontLayerConfigs.filter((l) => l.visible);
|
const visibleLayers = () => store.state.layerConfigs.filter((l) => l.visible);
|
||||||
const backVisibleLayers = () => store.state.backLayerConfigs.filter((l) => l.visible);
|
|
||||||
|
|
||||||
const handleExport = async () => {
|
const handleExport = async () => {
|
||||||
const options: ExportOptions = {
|
const options: ExportOptions = {
|
||||||
|
|
@ -32,7 +31,7 @@ export function PrintPreview(props: PrintPreviewProps) {
|
||||||
gridOriginY: store.state.dimensions?.gridOriginY || 0,
|
gridOriginY: store.state.dimensions?.gridOriginY || 0,
|
||||||
gridAreaWidth: store.state.dimensions?.gridAreaWidth || 56,
|
gridAreaWidth: store.state.dimensions?.gridAreaWidth || 56,
|
||||||
gridAreaHeight: store.state.dimensions?.gridAreaHeight || 88,
|
gridAreaHeight: store.state.dimensions?.gridAreaHeight || 88,
|
||||||
visibleLayers: frontVisibleLayers(),
|
visibleLayers: visibleLayers(),
|
||||||
dimensions: store.state.dimensions!
|
dimensions: store.state.dimensions!
|
||||||
};
|
};
|
||||||
await exportToPDF(pages(), cropMarks(), options);
|
await exportToPDF(pages(), cropMarks(), options);
|
||||||
|
|
@ -52,112 +51,103 @@ export function PrintPreview(props: PrintPreviewProps) {
|
||||||
|
|
||||||
<div class="flex flex-col items-center gap-8">
|
<div class="flex flex-col items-center gap-8">
|
||||||
<For each={pages()}>
|
<For each={pages()}>
|
||||||
{(page) => {
|
{(page) => (
|
||||||
// 根据页面类型(正面/背面)决定使用哪个图层配置
|
<svg
|
||||||
const isFrontPage = page.cards[0]?.side !== 'back';
|
class="bg-white shadow-xl"
|
||||||
const visibleLayersForPage = isFrontPage ? frontVisibleLayers() : backVisibleLayers();
|
viewBox={`0 0 ${getA4Size().width}mm ${getA4Size().height}mm`}
|
||||||
|
style={{
|
||||||
|
width: `${getA4Size().width}mm`,
|
||||||
|
height: `${getA4Size().height}mm`
|
||||||
|
}}
|
||||||
|
data-page={page.pageIndex + 1}
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<rect
|
||||||
|
x={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.x}mm`}
|
||||||
|
y={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.y}mm`}
|
||||||
|
width={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.width}mm`}
|
||||||
|
height={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.height}mm`}
|
||||||
|
fill="none"
|
||||||
|
stroke="black"
|
||||||
|
stroke-width="0.2"
|
||||||
|
/>
|
||||||
|
|
||||||
return (
|
<For each={cropMarks()[page.pageIndex]?.horizontalLines}>
|
||||||
<svg
|
{(line) => (
|
||||||
class="bg-white shadow-xl"
|
<>
|
||||||
viewBox={`0 0 ${getA4Size().width}mm ${getA4Size().height}mm`}
|
<line
|
||||||
style={{
|
x1={`${line.xStart}mm`}
|
||||||
width: `${getA4Size().width}mm`,
|
y1={`${line.y}mm`}
|
||||||
height: `${getA4Size().height}mm`
|
x2={`${page.frameBounds.minX}mm`}
|
||||||
}}
|
y2={`${line.y}mm`}
|
||||||
data-page={page.pageIndex + 1}
|
stroke="#888"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
stroke-width="0.1"
|
||||||
>
|
/>
|
||||||
<rect
|
<line
|
||||||
x={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.x}mm`}
|
x1={`${page.frameBounds.maxX}mm`}
|
||||||
y={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.y}mm`}
|
y1={`${line.y}mm`}
|
||||||
width={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.width}mm`}
|
x2={`${line.xEnd}mm`}
|
||||||
height={`${cropMarks()[page.pageIndex]?.frameBoundsWithMargin.height}mm`}
|
y2={`${line.y}mm`}
|
||||||
fill="none"
|
stroke="#888"
|
||||||
stroke="black"
|
stroke-width="0.1"
|
||||||
stroke-width="0.2"
|
/>
|
||||||
/>
|
</>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
|
||||||
<For each={cropMarks()[page.pageIndex]?.horizontalLines}>
|
<For each={cropMarks()[page.pageIndex]?.verticalLines}>
|
||||||
{(line) => (
|
{(line) => (
|
||||||
<>
|
<>
|
||||||
<line
|
<line
|
||||||
x1={`${line.xStart}mm`}
|
x1={`${line.x}mm`}
|
||||||
y1={`${line.y}mm`}
|
y1={`${line.yStart}mm`}
|
||||||
x2={`${page.frameBounds.minX}mm`}
|
x2={`${line.x}mm`}
|
||||||
y2={`${line.y}mm`}
|
y2={`${page.frameBounds.minY}mm`}
|
||||||
stroke="#888"
|
stroke="#888"
|
||||||
stroke-width="0.1"
|
stroke-width="0.1"
|
||||||
/>
|
/>
|
||||||
<line
|
<line
|
||||||
x1={`${page.frameBounds.maxX}mm`}
|
x1={`${line.x}mm`}
|
||||||
y1={`${line.y}mm`}
|
y1={`${page.frameBounds.maxY}mm`}
|
||||||
x2={`${line.xEnd}mm`}
|
x2={`${line.x}mm`}
|
||||||
y2={`${line.y}mm`}
|
y2={`${line.yEnd}mm`}
|
||||||
stroke="#888"
|
stroke="#888"
|
||||||
stroke-width="0.1"
|
stroke-width="0.1"
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</For>
|
</For>
|
||||||
|
|
||||||
<For each={cropMarks()[page.pageIndex]?.verticalLines}>
|
<For each={page.cards}>
|
||||||
{(line) => (
|
{(card) => (
|
||||||
<>
|
<g class="card-group">
|
||||||
<line
|
<foreignObject
|
||||||
x1={`${line.x}mm`}
|
x={`${card.x}mm`}
|
||||||
y1={`${line.yStart}mm`}
|
y={`${card.y}mm`}
|
||||||
x2={`${line.x}mm`}
|
width={`${store.state.dimensions?.cardWidth || 56}mm`}
|
||||||
y2={`${page.frameBounds.minY}mm`}
|
height={`${store.state.dimensions?.cardHeight || 88}mm`}
|
||||||
stroke="#888"
|
>
|
||||||
stroke-width="0.1"
|
<div class="w-full h-full bg-white" {...({ xmlns: 'http://www.w3.org/1999/xhtml' } as any)}>
|
||||||
/>
|
<div
|
||||||
<line
|
class="absolute"
|
||||||
x1={`${line.x}mm`}
|
style={{
|
||||||
y1={`${page.frameBounds.maxY}mm`}
|
position: 'absolute',
|
||||||
x2={`${line.x}mm`}
|
left: `${store.state.dimensions?.gridOriginX}mm`,
|
||||||
y2={`${line.yEnd}mm`}
|
top: `${store.state.dimensions?.gridOriginY}mm`,
|
||||||
stroke="#888"
|
width: `${store.state.dimensions?.gridAreaWidth}mm`,
|
||||||
stroke-width="0.1"
|
height: `${store.state.dimensions?.gridAreaHeight}mm`
|
||||||
/>
|
}}
|
||||||
</>
|
>
|
||||||
)}
|
<CardLayer store={store} cardData={card.data}
|
||||||
</For>
|
/>
|
||||||
|
|
||||||
<For each={page.cards}>
|
|
||||||
{(card) => (
|
|
||||||
<g class="card-group">
|
|
||||||
<foreignObject
|
|
||||||
x={`${card.x}mm`}
|
|
||||||
y={`${card.y}mm`}
|
|
||||||
width={`${store.state.dimensions?.cardWidth || 56}mm`}
|
|
||||||
height={`${store.state.dimensions?.cardHeight || 88}mm`}
|
|
||||||
>
|
|
||||||
<div class="w-full h-full bg-white" {...({ xmlns: 'http://www.w3.org/1999/xhtml' } as any)}>
|
|
||||||
<div
|
|
||||||
class="absolute"
|
|
||||||
style={{
|
|
||||||
position: 'absolute',
|
|
||||||
left: `${store.state.dimensions?.gridOriginX}mm`,
|
|
||||||
top: `${store.state.dimensions?.gridOriginY}mm`,
|
|
||||||
width: `${store.state.dimensions?.gridAreaWidth}mm`,
|
|
||||||
height: `${store.state.dimensions?.gridAreaHeight}mm`
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<CardLayer
|
|
||||||
store={store}
|
|
||||||
cardData={card.data}
|
|
||||||
side={card.side || 'front'}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</foreignObject>
|
</div>
|
||||||
</g>
|
</foreignObject>
|
||||||
)}
|
</g>
|
||||||
</For>
|
)}
|
||||||
</svg>
|
</For>
|
||||||
);
|
</svg>
|
||||||
}}
|
)}
|
||||||
</For>
|
</For>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,8 @@ export interface PrintPreviewHeaderProps {
|
||||||
export function PrintPreviewHeader(props: PrintPreviewHeaderProps) {
|
export function PrintPreviewHeader(props: PrintPreviewHeaderProps) {
|
||||||
const { store } = props;
|
const { store } = props;
|
||||||
const orientation = () => store.state.printOrientation;
|
const orientation = () => store.state.printOrientation;
|
||||||
const frontOddPageOffsetX = () => store.state.printFrontOddPageOffsetX;
|
const oddPageOffsetX = () => store.state.printOddPageOffsetX;
|
||||||
const frontOddPageOffsetY = () => store.state.printFrontOddPageOffsetY;
|
const oddPageOffsetY = () => store.state.printOddPageOffsetY;
|
||||||
const doubleSided = () => store.state.printDoubleSided;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div class="fixed top-0 left-0 right-0 z-50 bg-white shadow-lg rounded-lg mx-4 mt-4 px-4 py-3 flex items-center justify-between gap-4">
|
<div class="fixed top-0 left-0 right-0 z-50 bg-white shadow-lg rounded-lg mx-4 mt-4 px-4 py-3 flex items-center justify-between gap-4">
|
||||||
|
|
@ -46,27 +45,14 @@ export function PrintPreviewHeader(props: PrintPreviewHeaderProps) {
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<label class="flex items-center gap-1 cursor-pointer">
|
<label class="text-sm text-gray-600">奇数页偏移:</label>
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={doubleSided()}
|
|
||||||
onChange={(e) => store.actions.setPrintDoubleSided(e.target.checked)}
|
|
||||||
class="cursor-pointer"
|
|
||||||
/>
|
|
||||||
<span class="text-sm text-gray-600">双面打印</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<label class="text-sm text-gray-600">正面奇数页偏移:</label>
|
|
||||||
<div class="flex items-center gap-1">
|
<div class="flex items-center gap-1">
|
||||||
<span class="text-xs text-gray-500">X:</span>
|
<span class="text-xs text-gray-500">X:</span>
|
||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
value={frontOddPageOffsetX()}
|
value={oddPageOffsetX()}
|
||||||
onChange={(e) => store.actions.setPrintFrontOddPageOffsetX(Number(e.target.value))}
|
onChange={(e) => store.actions.setPrintOddPageOffsetX(Number(e.target.value))}
|
||||||
class="w-16 px-2 py-1 border border-gray-300 rounded text-sm"
|
class="w-16 px-2 py-1 border border-gray-300 rounded text-sm"
|
||||||
step="0.1"
|
step="0.1"
|
||||||
/>
|
/>
|
||||||
|
|
@ -76,8 +62,8 @@ export function PrintPreviewHeader(props: PrintPreviewHeaderProps) {
|
||||||
<span class="text-xs text-gray-500">Y:</span>
|
<span class="text-xs text-gray-500">Y:</span>
|
||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
value={frontOddPageOffsetY()}
|
value={oddPageOffsetY()}
|
||||||
onChange={(e) => store.actions.setPrintFrontOddPageOffsetY(Number(e.target.value))}
|
onChange={(e) => store.actions.setPrintOddPageOffsetY(Number(e.target.value))}
|
||||||
class="w-16 px-2 py-1 border border-gray-300 rounded text-sm"
|
class="w-16 px-2 py-1 border border-gray-300 rounded text-sm"
|
||||||
step="0.1"
|
step="0.1"
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -18,54 +18,33 @@ const ORIENTATION_OPTIONS = [
|
||||||
export function LayerEditorPanel(props: LayerEditorPanelProps) {
|
export function LayerEditorPanel(props: LayerEditorPanelProps) {
|
||||||
const { store } = props;
|
const { store } = props;
|
||||||
|
|
||||||
// 根据当前激活的面获取图层配置
|
|
||||||
const currentLayerConfigs = () =>
|
|
||||||
store.state.activeSide === 'front'
|
|
||||||
? store.state.frontLayerConfigs
|
|
||||||
: store.state.backLayerConfigs;
|
|
||||||
|
|
||||||
const updateLayerOrientation = (layerProp: string, orientation: 'n' | 's' | 'e' | 'w') => {
|
const updateLayerOrientation = (layerProp: string, orientation: 'n' | 's' | 'e' | 'w') => {
|
||||||
const updateFn = store.state.activeSide === 'front'
|
const layer = store.state.layerConfigs.find(l => l.prop === layerProp);
|
||||||
? store.actions.updateFrontLayerConfig
|
if (layer) {
|
||||||
: store.actions.updateBackLayerConfig;
|
store.actions.updateLayerConfig(layerProp, { ...layer, orientation });
|
||||||
updateFn(layerProp, { orientation });
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateLayerFontSize = (layerProp: string, fontSize?: number) => {
|
const updateLayerFontSize = (layerProp: string, fontSize?: number) => {
|
||||||
const updateFn = store.state.activeSide === 'front'
|
const layer = store.state.layerConfigs.find(l => l.prop === layerProp);
|
||||||
? store.actions.updateFrontLayerConfig
|
if (layer) {
|
||||||
: store.actions.updateBackLayerConfig;
|
store.actions.updateLayerConfig(layerProp, { ...layer, fontSize });
|
||||||
updateFn(layerProp, { fontSize });
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const toggleLayerVisible = (layerProp: string) => {
|
|
||||||
const toggleFn = store.state.activeSide === 'front'
|
|
||||||
? store.actions.toggleFrontLayerVisible
|
|
||||||
: store.actions.toggleBackLayerVisible;
|
|
||||||
toggleFn(layerProp);
|
|
||||||
};
|
|
||||||
|
|
||||||
const setEditingLayer = (layerProp: string) => {
|
|
||||||
store.actions.setEditingLayer(
|
|
||||||
store.state.editingLayer === layerProp ? null : layerProp
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div class="w-64 flex-shrink-0">
|
<div class="w-64 flex-shrink-0">
|
||||||
<h3 class="font-bold mb-2 mt-0">
|
<h3 class="font-bold mb-2 mt-0">图层</h3>
|
||||||
图层 ({store.state.activeSide === 'front' ? '正面' : '背面'})
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<For each={currentLayerConfigs()}>
|
<For each={store.state.layerConfigs}>
|
||||||
{(layer) => (
|
{(layer) => (
|
||||||
<div class="flex flex-row flex-wrap gap-1 p-2 bg-gray-50 rounded">
|
<div class="flex flex-row flex-wrap gap-1 p-2 bg-gray-50 rounded">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={layer.visible}
|
checked={layer.visible}
|
||||||
onChange={() => toggleLayerVisible(layer.prop)}
|
onChange={() => store.actions.toggleLayerVisible(layer.prop)}
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
/>
|
/>
|
||||||
<span class="text-sm flex-1">{layer.prop}</span>
|
<span class="text-sm flex-1">{layer.prop}</span>
|
||||||
|
|
@ -73,7 +52,7 @@ export function LayerEditorPanel(props: LayerEditorPanelProps) {
|
||||||
{layer.visible && (
|
{layer.visible && (
|
||||||
<>
|
<>
|
||||||
<button
|
<button
|
||||||
onClick={() => setEditingLayer(layer.prop)}
|
onClick={() => store.actions.setEditingLayer(store.state.editingLayer === layer.prop ? null : layer.prop)}
|
||||||
class={`text-xs px-2 py-1 rounded cursor-pointer ${
|
class={`text-xs px-2 py-1 rounded cursor-pointer ${
|
||||||
store.state.editingLayer === layer.prop
|
store.state.editingLayer === layer.prop
|
||||||
? 'bg-blue-500 text-white'
|
? 'bg-blue-500 text-white'
|
||||||
|
|
@ -120,11 +99,10 @@ export function LayerEditorPanel(props: LayerEditorPanelProps) {
|
||||||
<hr class="my-4" />
|
<hr class="my-4" />
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={() => store.actions.copyCode()}
|
onClick={store.actions.copyCode}
|
||||||
class="w-full bg-blue-600 hover:bg-blue-700 text-white px-3 py-2 rounded text-sm font-medium cursor-pointer flex items-center gap-2 justify-center"
|
class="w-full bg-blue-600 hover:bg-blue-700 text-white px-3 py-2 rounded text-sm font-medium cursor-pointer"
|
||||||
>
|
>
|
||||||
<span>📋</span>
|
📋 复制代码
|
||||||
<span>复制代码</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ export interface PropertiesEditorPanelProps {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 卡牌属性编辑面板:尺寸、网格、出血、内边距、正背面切换
|
* 卡牌属性编辑面板:尺寸、网格、出血、内边距
|
||||||
*/
|
*/
|
||||||
export function PropertiesEditorPanel(props: PropertiesEditorPanelProps) {
|
export function PropertiesEditorPanel(props: PropertiesEditorPanelProps) {
|
||||||
const { store } = props;
|
const { store } = props;
|
||||||
|
|
@ -14,32 +14,6 @@ export function PropertiesEditorPanel(props: PropertiesEditorPanelProps) {
|
||||||
<div class="w-64 flex-shrink-0">
|
<div class="w-64 flex-shrink-0">
|
||||||
<h3 class="font-bold mb-2 mt-0">卡牌属性</h3>
|
<h3 class="font-bold mb-2 mt-0">卡牌属性</h3>
|
||||||
|
|
||||||
{/* 正面/背面切换标签页 */}
|
|
||||||
<div class="mb-4">
|
|
||||||
<div class="flex gap-1">
|
|
||||||
<button
|
|
||||||
onClick={() => store.actions.setActiveSide('front')}
|
|
||||||
class={`flex-1 px-3 py-1.5 rounded text-sm font-medium cursor-pointer border ${
|
|
||||||
store.state.activeSide === 'front'
|
|
||||||
? 'bg-blue-600 text-white border-blue-600'
|
|
||||||
: 'bg-white text-gray-700 border-gray-300 hover:bg-gray-50'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
正面
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => store.actions.setActiveSide('back')}
|
|
||||||
class={`flex-1 px-3 py-1.5 rounded text-sm font-medium cursor-pointer border ${
|
|
||||||
store.state.activeSide === 'back'
|
|
||||||
? 'bg-blue-600 text-white border-blue-600'
|
|
||||||
: 'bg-white text-gray-700 border-gray-300 hover:bg-gray-50'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
背面
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="space-y-3">
|
<div class="space-y-3">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700">尺寸 (mm)</label>
|
<label class="block text-sm font-medium text-gray-700">尺寸 (mm)</label>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
import { createStore } from 'solid-js/store';
|
import { createStore } from 'solid-js/store';
|
||||||
import { calculateDimensions } from './dimensions';
|
import { calculateDimensions } from './dimensions';
|
||||||
import { loadCSV, CSV } from '../../utils/csv-loader';
|
import { loadCSV, CSV } from '../../utils/csv-loader';
|
||||||
import { initLayerConfigs, formatLayers, initLayerConfigsForSide } from './layer-parser';
|
import { initLayerConfigs, formatLayers } from './layer-parser';
|
||||||
import type { CardData, LayerConfig, Dimensions, CardSide } from '../types';
|
import type { CardData, LayerConfig, Dimensions } from '../types';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 默认配置常量
|
* 默认配置常量
|
||||||
|
|
@ -36,13 +36,11 @@ export interface DeckState {
|
||||||
activeTab: number;
|
activeTab: number;
|
||||||
|
|
||||||
// 图层配置
|
// 图层配置
|
||||||
frontLayerConfigs: LayerConfig[];
|
layerConfigs: LayerConfig[];
|
||||||
backLayerConfigs: LayerConfig[];
|
|
||||||
|
|
||||||
// 编辑状态
|
// 编辑状态
|
||||||
isEditing: boolean;
|
isEditing: boolean;
|
||||||
editingLayer: string | null;
|
editingLayer: string | null;
|
||||||
activeSide: CardSide;
|
|
||||||
|
|
||||||
// 框选状态
|
// 框选状态
|
||||||
isSelecting: boolean;
|
isSelecting: boolean;
|
||||||
|
|
@ -62,9 +60,8 @@ export interface DeckState {
|
||||||
|
|
||||||
// 打印设置
|
// 打印设置
|
||||||
printOrientation: 'portrait' | 'landscape';
|
printOrientation: 'portrait' | 'landscape';
|
||||||
printFrontOddPageOffsetX: number;
|
printOddPageOffsetX: number;
|
||||||
printFrontOddPageOffsetY: number;
|
printOddPageOffsetY: number;
|
||||||
printDoubleSided: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DeckActions {
|
export interface DeckActions {
|
||||||
|
|
@ -81,21 +78,15 @@ export interface DeckActions {
|
||||||
setActiveTab: (index: number) => void;
|
setActiveTab: (index: number) => void;
|
||||||
updateCardData: (index: number, key: string, value: string) => void;
|
updateCardData: (index: number, key: string, value: string) => void;
|
||||||
|
|
||||||
// 图层操作 - 正面
|
// 图层操作
|
||||||
setFrontLayerConfigs: (configs: LayerConfig[]) => void;
|
setLayerConfigs: (configs: LayerConfig[]) => void;
|
||||||
updateFrontLayerConfig: (prop: string, updates: Partial<LayerConfig>) => void;
|
updateLayerConfig: (prop: string, updates: Partial<LayerConfig>) => void;
|
||||||
toggleFrontLayerVisible: (prop: string) => void;
|
toggleLayerVisible: (prop: string) => void;
|
||||||
|
|
||||||
// 图层操作 - 背面
|
|
||||||
setBackLayerConfigs: (configs: LayerConfig[]) => void;
|
|
||||||
updateBackLayerConfig: (prop: string, updates: Partial<LayerConfig>) => void;
|
|
||||||
toggleBackLayerVisible: (prop: string) => void;
|
|
||||||
|
|
||||||
// 编辑状态
|
// 编辑状态
|
||||||
setIsEditing: (editing: boolean) => void;
|
setIsEditing: (editing: boolean) => void;
|
||||||
setEditingLayer: (layer: string | null) => void;
|
setEditingLayer: (layer: string | null) => void;
|
||||||
updateLayerPosition: (x1: number, y1: number, x2: number, y2: number) => void;
|
updateLayerPosition: (x1: number, y1: number, x2: number, y2: number) => void;
|
||||||
setActiveSide: (side: CardSide) => void;
|
|
||||||
|
|
||||||
// 框选操作
|
// 框选操作
|
||||||
setIsSelecting: (selecting: boolean) => void;
|
setIsSelecting: (selecting: boolean) => void;
|
||||||
|
|
@ -104,13 +95,13 @@ export interface DeckActions {
|
||||||
cancelSelection: () => void;
|
cancelSelection: () => void;
|
||||||
|
|
||||||
// 数据加载
|
// 数据加载
|
||||||
loadCardsFromPath: (path: string, rawSrc: string, layersStr?: string, backLayersStr?: string) => Promise<void>;
|
loadCardsFromPath: (path: string, rawSrc: string, layersStr?: string) => Promise<void>;
|
||||||
setError: (error: string | null) => void;
|
setError: (error: string | null) => void;
|
||||||
clearError: () => void;
|
clearError: () => void;
|
||||||
|
|
||||||
// 生成代码
|
// 生成代码
|
||||||
generateCode: (backLayersStr?: string) => string;
|
generateCode: () => string;
|
||||||
copyCode: (backLayersStr?: string) => Promise<void>;
|
copyCode: () => Promise<void>;
|
||||||
|
|
||||||
// 导出操作
|
// 导出操作
|
||||||
setExporting: (exporting: boolean) => void;
|
setExporting: (exporting: boolean) => void;
|
||||||
|
|
@ -121,9 +112,8 @@ export interface DeckActions {
|
||||||
|
|
||||||
// 打印设置
|
// 打印设置
|
||||||
setPrintOrientation: (orientation: 'portrait' | 'landscape') => void;
|
setPrintOrientation: (orientation: 'portrait' | 'landscape') => void;
|
||||||
setPrintFrontOddPageOffsetX: (offset: number) => void;
|
setPrintOddPageOffsetX: (offset: number) => void;
|
||||||
setPrintFrontOddPageOffsetY: (offset: number) => void;
|
setPrintOddPageOffsetY: (offset: number) => void;
|
||||||
setPrintDoubleSided: (doubleSided: boolean) => void;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DeckStore {
|
export interface DeckStore {
|
||||||
|
|
@ -136,6 +126,7 @@ export interface DeckStore {
|
||||||
*/
|
*/
|
||||||
export function createDeckStore(
|
export function createDeckStore(
|
||||||
initialSrc: string = '',
|
initialSrc: string = '',
|
||||||
|
initialLayers: string = ''
|
||||||
): DeckStore {
|
): DeckStore {
|
||||||
const [state, setState] = createStore<DeckState>({
|
const [state, setState] = createStore<DeckState>({
|
||||||
sizeW: DECK_DEFAULTS.SIZE_W,
|
sizeW: DECK_DEFAULTS.SIZE_W,
|
||||||
|
|
@ -150,11 +141,9 @@ export function createDeckStore(
|
||||||
dimensions: null,
|
dimensions: null,
|
||||||
cards: [] as any,
|
cards: [] as any,
|
||||||
activeTab: 0,
|
activeTab: 0,
|
||||||
frontLayerConfigs: [],
|
layerConfigs: [],
|
||||||
backLayerConfigs: [],
|
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
editingLayer: null,
|
editingLayer: null,
|
||||||
activeSide: 'front',
|
|
||||||
isSelecting: false,
|
isSelecting: false,
|
||||||
selectStart: null,
|
selectStart: null,
|
||||||
selectEnd: null,
|
selectEnd: null,
|
||||||
|
|
@ -164,9 +153,8 @@ export function createDeckStore(
|
||||||
exportProgress: 0,
|
exportProgress: 0,
|
||||||
exportError: null,
|
exportError: null,
|
||||||
printOrientation: 'portrait',
|
printOrientation: 'portrait',
|
||||||
printFrontOddPageOffsetX: 0,
|
printOddPageOffsetX: 0,
|
||||||
printFrontOddPageOffsetY: 0,
|
printOddPageOffsetY: 0
|
||||||
printDoubleSided: false
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// 更新尺寸并重新计算 dimensions
|
// 更新尺寸并重新计算 dimensions
|
||||||
|
|
@ -213,39 +201,22 @@ export function createDeckStore(
|
||||||
setState('cards', index, key, value);
|
setState('cards', index, key, value);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 正面图层操作
|
const setLayerConfigs = (configs: LayerConfig[]) => setState({ layerConfigs: configs });
|
||||||
const setFrontLayerConfigs = (configs: LayerConfig[]) => setState({ frontLayerConfigs: configs });
|
const updateLayerConfig = (prop: string, updates: Partial<LayerConfig>) => {
|
||||||
const updateFrontLayerConfig = (prop: string, updates: Partial<LayerConfig>) => {
|
setState('layerConfigs', (prev) => prev.map((config) => config.prop === prop ? { ...config, ...updates } : config));
|
||||||
setState('frontLayerConfigs', (prev) => prev.map((config) => config.prop === prop ? { ...config, ...updates } : config));
|
|
||||||
};
|
};
|
||||||
const toggleFrontLayerVisible = (prop: string) => {
|
const toggleLayerVisible = (prop: string) => {
|
||||||
setState('frontLayerConfigs', (prev) => prev.map((config) =>
|
setState('layerConfigs', (prev) => prev.map((config) =>
|
||||||
config.prop === prop ? { ...config, visible: !config.visible } : config
|
|
||||||
));
|
|
||||||
};
|
|
||||||
|
|
||||||
// 背面图层操作
|
|
||||||
const setBackLayerConfigs = (configs: LayerConfig[]) => setState({ backLayerConfigs: configs });
|
|
||||||
const updateBackLayerConfig = (prop: string, updates: Partial<LayerConfig>) => {
|
|
||||||
setState('backLayerConfigs', (prev) => prev.map((config) => config.prop === prop ? { ...config, ...updates } : config));
|
|
||||||
};
|
|
||||||
const toggleBackLayerVisible = (prop: string) => {
|
|
||||||
setState('backLayerConfigs', (prev) => prev.map((config) =>
|
|
||||||
config.prop === prop ? { ...config, visible: !config.visible } : config
|
config.prop === prop ? { ...config, visible: !config.visible } : config
|
||||||
));
|
));
|
||||||
};
|
};
|
||||||
|
|
||||||
const setIsEditing = (editing: boolean) => setState({ isEditing: editing });
|
const setIsEditing = (editing: boolean) => setState({ isEditing: editing });
|
||||||
const setEditingLayer = (layer: string | null) => setState({ editingLayer: layer });
|
const setEditingLayer = (layer: string | null) => setState({ editingLayer: layer });
|
||||||
const setActiveSide = (side: CardSide) => setState({ activeSide: side });
|
|
||||||
|
|
||||||
const updateLayerPosition = (x1: number, y1: number, x2: number, y2: number) => {
|
const updateLayerPosition = (x1: number, y1: number, x2: number, y2: number) => {
|
||||||
const layer = state.editingLayer;
|
const layer = state.editingLayer;
|
||||||
if (!layer) return;
|
if (!layer) return;
|
||||||
const currentSide = state.activeSide;
|
setState('layerConfigs', (prev) => prev.map((config) =>
|
||||||
const configs = currentSide === 'front' ? state.frontLayerConfigs : state.backLayerConfigs;
|
|
||||||
const setter = currentSide === 'front' ? setFrontLayerConfigs : setBackLayerConfigs;
|
|
||||||
setter(configs.map((config) =>
|
|
||||||
config.prop === layer ? { ...config, x1, y1, x2, y2 } : config
|
config.prop === layer ? { ...config, x1, y1, x2, y2 } : config
|
||||||
));
|
));
|
||||||
setState({ editingLayer: null });
|
setState({ editingLayer: null });
|
||||||
|
|
@ -259,7 +230,7 @@ export function createDeckStore(
|
||||||
};
|
};
|
||||||
|
|
||||||
// 加载卡牌数据(核心逻辑)
|
// 加载卡牌数据(核心逻辑)
|
||||||
const loadCardsFromPath = async (path: string, rawSrc: string, layersStr: string = '', backLayersStr: string = '') => {
|
const loadCardsFromPath = async (path: string, rawSrc: string, layersStr: string = '') => {
|
||||||
if (!path) {
|
if (!path) {
|
||||||
setState({ error: '未指定 CSV 文件路径' });
|
setState({ error: '未指定 CSV 文件路径' });
|
||||||
return;
|
return;
|
||||||
|
|
@ -281,8 +252,7 @@ export function createDeckStore(
|
||||||
setState({
|
setState({
|
||||||
cards: data,
|
cards: data,
|
||||||
activeTab: 0,
|
activeTab: 0,
|
||||||
frontLayerConfigs: initLayerConfigsForSide(data, layersStr),
|
layerConfigs: initLayerConfigs(data, layersStr),
|
||||||
backLayerConfigs: initLayerConfigsForSide(data, backLayersStr),
|
|
||||||
isLoading: false
|
isLoading: false
|
||||||
});
|
});
|
||||||
updateDimensions();
|
updateDimensions();
|
||||||
|
|
@ -297,33 +267,28 @@ export function createDeckStore(
|
||||||
const setError = (error: string | null) => setState({ error });
|
const setError = (error: string | null) => setState({ error });
|
||||||
const clearError = () => setState({ error: null });
|
const clearError = () => setState({ error: null });
|
||||||
|
|
||||||
const generateCode = (backLayersStr?: string) => {
|
const generateCode = () => {
|
||||||
const frontLayersStr = formatLayers(state.frontLayerConfigs);
|
const layersStr = formatLayers(state.layerConfigs);
|
||||||
const backLayersString = backLayersStr || formatLayers(state.backLayerConfigs);
|
|
||||||
const parts = [
|
const parts = [
|
||||||
`:md-deck[${state.rawSrc || state.src}]`,
|
`:md-deck[${state.rawSrc || state.src}]`,
|
||||||
`{size="${state.sizeW}x${state.sizeH}" `,
|
`{size="${state.sizeW}x${state.sizeH} "`,
|
||||||
`grid="${state.gridW}x${state.gridH}" `
|
`grid="${state.gridW}x${state.gridH} "`
|
||||||
];
|
];
|
||||||
|
|
||||||
// 仅在非默认值时添加 bleed 和 padding
|
// 仅在非默认值时添加 bleed 和 padding
|
||||||
if (state.bleed !== DECK_DEFAULTS.BLEED) {
|
if (state.bleed !== DECK_DEFAULTS.BLEED) {
|
||||||
parts.push(`bleed="${state.bleed}" `);
|
parts.push(`bleed="${state.bleed} "`);
|
||||||
}
|
}
|
||||||
if (state.padding !== DECK_DEFAULTS.PADDING) {
|
if (state.padding !== DECK_DEFAULTS.PADDING) {
|
||||||
parts.push(`padding="${state.padding}" `);
|
parts.push(`padding="${state.padding} "`);
|
||||||
}
|
}
|
||||||
|
|
||||||
parts.push(`layers="${frontLayersStr}" `);
|
parts.push(`layers="${layersStr}"}`);
|
||||||
if (backLayersString) {
|
|
||||||
parts.push(`back-layers="${backLayersString}" `);
|
|
||||||
}
|
|
||||||
parts.push('}');
|
|
||||||
return parts.join('');
|
return parts.join('');
|
||||||
};
|
};
|
||||||
|
|
||||||
const copyCode = async (backLayersStr?: string) => {
|
const copyCode = async () => {
|
||||||
const code = generateCode(backLayersStr);
|
const code = generateCode();
|
||||||
try {
|
try {
|
||||||
await navigator.clipboard.writeText(code);
|
await navigator.clipboard.writeText(code);
|
||||||
alert('已复制到剪贴板!');
|
alert('已复制到剪贴板!');
|
||||||
|
|
@ -349,16 +314,12 @@ export function createDeckStore(
|
||||||
setState({ printOrientation: orientation });
|
setState({ printOrientation: orientation });
|
||||||
};
|
};
|
||||||
|
|
||||||
const setPrintFrontOddPageOffsetX = (offset: number) => {
|
const setPrintOddPageOffsetX = (offset: number) => {
|
||||||
setState({ printFrontOddPageOffsetX: offset });
|
setState({ printOddPageOffsetX: offset });
|
||||||
};
|
};
|
||||||
|
|
||||||
const setPrintFrontOddPageOffsetY = (offset: number) => {
|
const setPrintOddPageOffsetY = (offset: number) => {
|
||||||
setState({ printFrontOddPageOffsetY: offset });
|
setState({ printOddPageOffsetY: offset });
|
||||||
};
|
|
||||||
|
|
||||||
const setPrintDoubleSided = (doubleSided: boolean) => {
|
|
||||||
setState({ printDoubleSided: doubleSided });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const actions: DeckActions = {
|
const actions: DeckActions = {
|
||||||
|
|
@ -371,16 +332,12 @@ export function createDeckStore(
|
||||||
setCards,
|
setCards,
|
||||||
setActiveTab,
|
setActiveTab,
|
||||||
updateCardData,
|
updateCardData,
|
||||||
setFrontLayerConfigs,
|
setLayerConfigs,
|
||||||
updateFrontLayerConfig,
|
updateLayerConfig,
|
||||||
toggleFrontLayerVisible,
|
toggleLayerVisible,
|
||||||
setBackLayerConfigs,
|
|
||||||
updateBackLayerConfig,
|
|
||||||
toggleBackLayerVisible,
|
|
||||||
setIsEditing,
|
setIsEditing,
|
||||||
setEditingLayer,
|
setEditingLayer,
|
||||||
updateLayerPosition,
|
updateLayerPosition,
|
||||||
setActiveSide,
|
|
||||||
setIsSelecting,
|
setIsSelecting,
|
||||||
setSelectStart,
|
setSelectStart,
|
||||||
setSelectEnd,
|
setSelectEnd,
|
||||||
|
|
@ -396,9 +353,8 @@ export function createDeckStore(
|
||||||
setExportError,
|
setExportError,
|
||||||
clearExportError,
|
clearExportError,
|
||||||
setPrintOrientation,
|
setPrintOrientation,
|
||||||
setPrintFrontOddPageOffsetX,
|
setPrintOddPageOffsetX,
|
||||||
setPrintFrontOddPageOffsetY,
|
setPrintOddPageOffsetY
|
||||||
setPrintDoubleSided
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return { state, actions };
|
return { state, actions };
|
||||||
|
|
|
||||||
|
|
@ -49,13 +49,13 @@ export function formatLayers(layers: LayerConfig[]): string {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化图层配置(用于特定面)
|
* 初始化图层配置
|
||||||
*/
|
*/
|
||||||
export function initLayerConfigsForSide(
|
export function initLayerConfigs(
|
||||||
data: CSV<any>,
|
data: CSV<any>,
|
||||||
layersStr: string
|
existingLayersStr: string
|
||||||
): LayerConfig[] {
|
): LayerConfig[] {
|
||||||
const parsed = parseLayers(layersStr);
|
const parsed = parseLayers(existingLayersStr);
|
||||||
const allProps = Object.keys(data[0] || {}).filter(k => k !== 'label');
|
const allProps = Object.keys(data[0] || {}).filter(k => k !== 'label');
|
||||||
|
|
||||||
return allProps.map(prop => {
|
return allProps.map(prop => {
|
||||||
|
|
@ -72,13 +72,3 @@ export function initLayerConfigsForSide(
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 初始化图层配置(向后兼容)
|
|
||||||
*/
|
|
||||||
export function initLayerConfigs(
|
|
||||||
data: CSV<any>,
|
|
||||||
existingLayersStr: string
|
|
||||||
): LayerConfig[] {
|
|
||||||
return initLayerConfigsForSide(data, existingLayersStr);
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
import type { DeckStore } from './deckStore';
|
import type { DeckStore } from './deckStore';
|
||||||
import type { CardData, LayerConfig, Dimensions, CardSide } from '../types';
|
import type { CardData, LayerConfig, Dimensions } from '../types';
|
||||||
|
|
||||||
export interface PageCard {
|
export interface PageCard {
|
||||||
data: CardData;
|
data: CardData;
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
side?: CardSide;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PageData {
|
export interface PageData {
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,8 @@ const PRINT_MARGIN = 5;
|
||||||
*/
|
*/
|
||||||
export function usePageLayout(store: DeckStore): UsePageLayoutReturn {
|
export function usePageLayout(store: DeckStore): UsePageLayoutReturn {
|
||||||
const orientation = () => store.state.printOrientation;
|
const orientation = () => store.state.printOrientation;
|
||||||
const doubleSided = () => store.state.printDoubleSided;
|
const oddPageOffsetX = () => store.state.printOddPageOffsetX;
|
||||||
const frontOddPageOffsetX = () => store.state.printFrontOddPageOffsetX;
|
const oddPageOffsetY = () => store.state.printOddPageOffsetY;
|
||||||
const frontOddPageOffsetY = () => store.state.printFrontOddPageOffsetY;
|
|
||||||
|
|
||||||
const getA4Size = () => {
|
const getA4Size = () => {
|
||||||
if (orientation() === 'landscape') {
|
if (orientation() === 'landscape') {
|
||||||
|
|
@ -53,129 +52,56 @@ export function usePageLayout(store: DeckStore): UsePageLayoutReturn {
|
||||||
const baseOffsetY = (a4Height - maxGridHeight) / 2;
|
const baseOffsetY = (a4Height - maxGridHeight) / 2;
|
||||||
|
|
||||||
const result: PageData[] = [];
|
const result: PageData[] = [];
|
||||||
|
let currentPage: PageData = {
|
||||||
|
pageIndex: 0,
|
||||||
|
cards: [],
|
||||||
|
bounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
|
||||||
|
frameBounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity }
|
||||||
|
};
|
||||||
|
|
||||||
if (doubleSided()) {
|
for (let i = 0; i < cards.length; i++) {
|
||||||
// 双面打印模式:每页多张卡牌,正面和背面分别在相邻的两页
|
const pageIndex = Math.floor(i / cardsPerPage);
|
||||||
const totalCards = cards.length;
|
const indexInPage = i % cardsPerPage;
|
||||||
const totalPages = Math.ceil(totalCards / cardsPerPage);
|
const row = Math.floor(indexInPage / cardsPerRow);
|
||||||
|
const col = indexInPage % cardsPerRow;
|
||||||
|
|
||||||
for (let pageIndex = 0; pageIndex < totalPages; pageIndex++) {
|
if (pageIndex !== currentPage.pageIndex) {
|
||||||
const frontPageIndex = pageIndex * 2;
|
|
||||||
const backPageIndex = pageIndex * 2 + 1;
|
|
||||||
|
|
||||||
// 确保页面数组有足够长度
|
|
||||||
while (result.length <= backPageIndex) {
|
|
||||||
result.push({
|
|
||||||
pageIndex: result.length,
|
|
||||||
cards: [],
|
|
||||||
bounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
|
|
||||||
frameBounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity }
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const frontPage = result[frontPageIndex];
|
|
||||||
const backPage = result[backPageIndex];
|
|
||||||
|
|
||||||
// 计算当前正面页的卡牌范围
|
|
||||||
const startCardIndex = pageIndex * cardsPerPage;
|
|
||||||
const endCardIndex = Math.min(startCardIndex + cardsPerPage, totalCards);
|
|
||||||
|
|
||||||
for (let i = startCardIndex; i < endCardIndex; i++) {
|
|
||||||
// 正面:正常顺序排列
|
|
||||||
const indexInPage = i - startCardIndex;
|
|
||||||
const row = Math.floor(indexInPage / cardsPerRow);
|
|
||||||
const col = indexInPage % cardsPerRow;
|
|
||||||
// 双面打印时,所有正面页都在奇数物理页上,所以都应用偏移
|
|
||||||
const pageOffsetX = frontOddPageOffsetX();
|
|
||||||
const pageOffsetY = frontOddPageOffsetY();
|
|
||||||
|
|
||||||
const frontX = baseOffsetX + col * cardWidth + pageOffsetX;
|
|
||||||
const frontY = baseOffsetY + row * cardHeight + pageOffsetY;
|
|
||||||
|
|
||||||
frontPage.cards.push({ data: cards[i], x: frontX, y: frontY, side: 'front' as const });
|
|
||||||
frontPage.bounds.minX = Math.min(frontPage.bounds.minX, frontX);
|
|
||||||
frontPage.bounds.minY = Math.min(frontPage.bounds.minY, frontY);
|
|
||||||
frontPage.bounds.maxX = Math.max(frontPage.bounds.maxX, frontX + cardWidth);
|
|
||||||
frontPage.bounds.maxY = Math.max(frontPage.bounds.maxY, frontY + cardHeight);
|
|
||||||
|
|
||||||
// 背面:逆转顺序排列(长边方向)
|
|
||||||
// 对于竖向打印,长边是垂直方向,所以逆转行
|
|
||||||
// 对于横向打印,长边是水平方向,所以逆转列
|
|
||||||
const backRow = orientation() === 'portrait'
|
|
||||||
? (rowsPerPage - 1 - row)
|
|
||||||
: row;
|
|
||||||
const backCol = orientation() === 'portrait'
|
|
||||||
? col
|
|
||||||
: (cardsPerRow - 1 - col);
|
|
||||||
|
|
||||||
const backX = baseOffsetX + backCol * cardWidth;
|
|
||||||
const backY = baseOffsetY + backRow * cardHeight;
|
|
||||||
|
|
||||||
backPage.cards.push({ data: cards[i], x: backX, y: backY, side: 'back' as const });
|
|
||||||
backPage.bounds.minX = Math.min(backPage.bounds.minX, backX);
|
|
||||||
backPage.bounds.minY = Math.min(backPage.bounds.minY, backY);
|
|
||||||
backPage.bounds.maxX = Math.max(backPage.bounds.maxX, backX + cardWidth);
|
|
||||||
backPage.bounds.maxY = Math.max(backPage.bounds.maxY, backY + cardHeight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// 单面打印模式:原有逻辑
|
|
||||||
let currentPage: PageData = {
|
|
||||||
pageIndex: 0,
|
|
||||||
cards: [],
|
|
||||||
bounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
|
|
||||||
frameBounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity }
|
|
||||||
};
|
|
||||||
|
|
||||||
for (let i = 0; i < cards.length; i++) {
|
|
||||||
const pageIndex = Math.floor(i / cardsPerPage);
|
|
||||||
const indexInPage = i % cardsPerPage;
|
|
||||||
const row = Math.floor(indexInPage / cardsPerRow);
|
|
||||||
const col = indexInPage % cardsPerRow;
|
|
||||||
|
|
||||||
if (pageIndex !== currentPage.pageIndex) {
|
|
||||||
result.push(currentPage);
|
|
||||||
currentPage = {
|
|
||||||
pageIndex,
|
|
||||||
cards: [],
|
|
||||||
bounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
|
|
||||||
frameBounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity }
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const isOddPage = pageIndex % 2 === 0;
|
|
||||||
const pageOffsetX = isOddPage ? frontOddPageOffsetX() : 0;
|
|
||||||
const pageOffsetY = isOddPage ? frontOddPageOffsetY() : 0;
|
|
||||||
|
|
||||||
const cardX = baseOffsetX + col * cardWidth + pageOffsetX;
|
|
||||||
const cardY = baseOffsetY + row * cardHeight + pageOffsetY;
|
|
||||||
|
|
||||||
currentPage.cards.push({ data: cards[i], x: cardX, y: cardY, side: 'front' as const });
|
|
||||||
currentPage.bounds.minX = Math.min(currentPage.bounds.minX, cardX);
|
|
||||||
currentPage.bounds.minY = Math.min(currentPage.bounds.minY, cardY);
|
|
||||||
currentPage.bounds.maxX = Math.max(currentPage.bounds.maxX, cardX + cardWidth);
|
|
||||||
currentPage.bounds.maxY = Math.max(currentPage.bounds.maxY, cardY + cardHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentPage.cards.length > 0) {
|
|
||||||
result.push(currentPage);
|
result.push(currentPage);
|
||||||
|
currentPage = {
|
||||||
|
pageIndex,
|
||||||
|
cards: [],
|
||||||
|
bounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
|
||||||
|
frameBounds: { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity }
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isOddPage = pageIndex % 2 === 0;
|
||||||
|
const pageOffsetX = isOddPage ? oddPageOffsetX() : 0;
|
||||||
|
const pageOffsetY = isOddPage ? oddPageOffsetY() : 0;
|
||||||
|
|
||||||
|
const cardX = baseOffsetX + col * cardWidth + pageOffsetX;
|
||||||
|
const cardY = baseOffsetY + row * cardHeight + pageOffsetY;
|
||||||
|
|
||||||
|
currentPage.cards.push({ data: cards[i], x: cardX, y: cardY });
|
||||||
|
currentPage.bounds.minX = Math.min(currentPage.bounds.minX, cardX);
|
||||||
|
currentPage.bounds.minY = Math.min(currentPage.bounds.minY, cardY);
|
||||||
|
currentPage.bounds.maxX = Math.max(currentPage.bounds.maxX, cardX + cardWidth);
|
||||||
|
currentPage.bounds.maxY = Math.max(currentPage.bounds.maxY, cardY + cardHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result.map(page => {
|
if (currentPage.cards.length > 0) {
|
||||||
const offsetX = doubleSided() && page.pageIndex % 2 === 0 ? frontOddPageOffsetX() : 0;
|
result.push(currentPage);
|
||||||
const offsetY = doubleSided() && page.pageIndex % 2 === 0 ? frontOddPageOffsetY() : 0;
|
}
|
||||||
|
|
||||||
return {
|
return result.map(page => ({
|
||||||
...page,
|
...page,
|
||||||
frameBounds: {
|
frameBounds: {
|
||||||
minX: baseOffsetX + offsetX,
|
minX: baseOffsetX + (page.pageIndex % 2 === 0 ? oddPageOffsetX() : 0),
|
||||||
minY: baseOffsetY + offsetY,
|
minY: baseOffsetY + (page.pageIndex % 2 === 0 ? oddPageOffsetY() : 0),
|
||||||
maxX: baseOffsetX + maxGridWidth + offsetX,
|
maxX: baseOffsetX + maxGridWidth + (page.pageIndex % 2 === 0 ? oddPageOffsetX() : 0),
|
||||||
maxY: baseOffsetY + maxGridHeight + offsetY
|
maxY: baseOffsetY + maxGridHeight + (page.pageIndex % 2 === 0 ? oddPageOffsetY() : 0)
|
||||||
}
|
}
|
||||||
};
|
}));
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const cropMarks = createMemo<CropMarkData[]>(() => {
|
const cropMarks = createMemo<CropMarkData[]>(() => {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ interface DeckProps {
|
||||||
bleed?: number | string;
|
bleed?: number | string;
|
||||||
padding?: number | string;
|
padding?: number | string;
|
||||||
layers?: string;
|
layers?: string;
|
||||||
backLayers?: string;
|
|
||||||
fixed?: boolean | string;
|
fixed?: boolean | string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -31,7 +30,6 @@ customElement<DeckProps>('md-deck', {
|
||||||
bleed: 1,
|
bleed: 1,
|
||||||
padding: 2,
|
padding: 2,
|
||||||
layers: '',
|
layers: '',
|
||||||
backLayers: '',
|
|
||||||
fixed: false
|
fixed: false
|
||||||
}, (props, { element }) => {
|
}, (props, { element }) => {
|
||||||
noShadowDOM();
|
noShadowDOM();
|
||||||
|
|
@ -52,7 +50,7 @@ customElement<DeckProps>('md-deck', {
|
||||||
const resolvedSrc = resolvePath(articlePath, csvPath);
|
const resolvedSrc = resolvePath(articlePath, csvPath);
|
||||||
|
|
||||||
// 创建 store 并加载数据
|
// 创建 store 并加载数据
|
||||||
const store = createDeckStore(resolvedSrc);
|
const store = createDeckStore(resolvedSrc, (props.layers as string) || '');
|
||||||
|
|
||||||
// 解析 size 属性(支持旧格式 "54x86" 和新格式)
|
// 解析 size 属性(支持旧格式 "54x86" 和新格式)
|
||||||
if (props.size && props.size.includes('x')) {
|
if (props.size && props.size.includes('x')) {
|
||||||
|
|
@ -88,12 +86,7 @@ customElement<DeckProps>('md-deck', {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加载 CSV 数据
|
// 加载 CSV 数据
|
||||||
store.actions.loadCardsFromPath(
|
store.actions.loadCardsFromPath(resolvedSrc, csvPath, (props.layers as string) || '');
|
||||||
resolvedSrc,
|
|
||||||
csvPath,
|
|
||||||
(props.layers as string) || '',
|
|
||||||
(props.backLayers as string) || ''
|
|
||||||
);
|
|
||||||
|
|
||||||
// 清理函数
|
// 清理函数
|
||||||
onCleanup(() => {
|
onCleanup(() => {
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,6 @@ export interface CardData {
|
||||||
[key: string]: string;
|
[key: string]: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type CardSide = 'front' | 'back';
|
|
||||||
|
|
||||||
export interface Layer {
|
export interface Layer {
|
||||||
prop: string;
|
prop: string;
|
||||||
x1: number;
|
x1: number;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue