修复
This commit is contained in:
11
src/App.tsx
11
src/App.tsx
@@ -952,15 +952,6 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const printBlockedReason =
|
|
||||||
!appliedExportData
|
|
||||||
? '请先应用数据'
|
|
||||||
: appliedLayoutResult.selectedCount === 0
|
|
||||||
? '当前数据范围内无标签'
|
|
||||||
: previewLayoutStale
|
|
||||||
? '排版已变更,请重新绘制预览'
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const isDarkWorkspace =
|
const isDarkWorkspace =
|
||||||
workflowStep === 'template-design' || workflowStep === 'print-view';
|
workflowStep === 'template-design' || workflowStep === 'print-view';
|
||||||
const isMobileDarkShell = isMobile && isDarkWorkspace;
|
const isMobileDarkShell = isMobile && isDarkWorkspace;
|
||||||
@@ -1478,7 +1469,6 @@ export default function App() {
|
|||||||
pdfGenerating ||
|
pdfGenerating ||
|
||||||
imagesZipGenerating
|
imagesZipGenerating
|
||||||
}
|
}
|
||||||
printDisabledReason={printBlockedReason}
|
|
||||||
onExportImages={exportLabelsImagesZip}
|
onExportImages={exportLabelsImagesZip}
|
||||||
imagesExporting={imagesZipGenerating}
|
imagesExporting={imagesZipGenerating}
|
||||||
onChangeExportImageFileNamePattern={handleExportImageFileNamePatternChange}
|
onChangeExportImageFileNamePattern={handleExportImageFileNamePatternChange}
|
||||||
@@ -1599,7 +1589,6 @@ export default function App() {
|
|||||||
pdfGenerating ||
|
pdfGenerating ||
|
||||||
imagesZipGenerating
|
imagesZipGenerating
|
||||||
}
|
}
|
||||||
printDisabledReason={printBlockedReason}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ interface ExportSidebarProps {
|
|||||||
onChangeExportImageFilterMode?: (mode: ElementVisibilityMode) => void;
|
onChangeExportImageFilterMode?: (mode: ElementVisibilityMode) => void;
|
||||||
onChangeExportImageFilterRules?: (rules: VisibilityRule[]) => void;
|
onChangeExportImageFilterRules?: (rules: VisibilityRule[]) => void;
|
||||||
printDisabled: boolean;
|
printDisabled: boolean;
|
||||||
printDisabledReason?: string | null;
|
|
||||||
/** 移动端精简:仅数据、映射、数据范围 */
|
/** 移动端精简:仅数据、映射、数据范围 */
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
}
|
}
|
||||||
@@ -86,7 +85,6 @@ export const ExportSidebar: React.FC<ExportSidebarProps> = ({
|
|||||||
onChangeExportImageFilterMode,
|
onChangeExportImageFilterMode,
|
||||||
onChangeExportImageFilterRules,
|
onChangeExportImageFilterRules,
|
||||||
printDisabled,
|
printDisabled,
|
||||||
printDisabledReason = null,
|
|
||||||
compact = false,
|
compact = false,
|
||||||
}) => {
|
}) => {
|
||||||
type ExportPanelKey = 'data' | 'layout' | 'print';
|
type ExportPanelKey = 'data' | 'layout' | 'print';
|
||||||
@@ -323,7 +321,6 @@ export const ExportSidebar: React.FC<ExportSidebarProps> = ({
|
|||||||
>
|
>
|
||||||
<PrintModule
|
<PrintModule
|
||||||
disabled={printDisabled}
|
disabled={printDisabled}
|
||||||
disabledReason={printDisabledReason}
|
|
||||||
printing={printing}
|
printing={printing}
|
||||||
onPrint={onPrint}
|
onPrint={onPrint}
|
||||||
imagesExporting={imagesExporting}
|
imagesExporting={imagesExporting}
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ interface MobileExportViewProps {
|
|||||||
onChangeExportImageFilterMode?: (mode: ElementVisibilityMode) => void;
|
onChangeExportImageFilterMode?: (mode: ElementVisibilityMode) => void;
|
||||||
onChangeExportImageFilterRules?: (rules: VisibilityRule[]) => void;
|
onChangeExportImageFilterRules?: (rules: VisibilityRule[]) => void;
|
||||||
printDisabled: boolean;
|
printDisabled: boolean;
|
||||||
printDisabledReason?: string | null;
|
|
||||||
imagesExporting?: boolean;
|
imagesExporting?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +119,6 @@ export const MobileExportView: React.FC<MobileExportViewProps> = ({
|
|||||||
onExportPdf,
|
onExportPdf,
|
||||||
onPrint,
|
onPrint,
|
||||||
printDisabled,
|
printDisabled,
|
||||||
printDisabledReason = null,
|
|
||||||
onExportImages,
|
onExportImages,
|
||||||
imagesExporting = false,
|
imagesExporting = false,
|
||||||
onChangeExportImageFileNamePattern,
|
onChangeExportImageFileNamePattern,
|
||||||
@@ -293,7 +291,6 @@ export const MobileExportView: React.FC<MobileExportViewProps> = ({
|
|||||||
<PrintModule
|
<PrintModule
|
||||||
variant="mobile"
|
variant="mobile"
|
||||||
disabled={printDisabled}
|
disabled={printDisabled}
|
||||||
disabledReason={printDisabledReason}
|
|
||||||
printing={printing}
|
printing={printing}
|
||||||
onPrint={onPrint}
|
onPrint={onPrint}
|
||||||
imagesExporting={imagesExporting}
|
imagesExporting={imagesExporting}
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import {
|
|||||||
|
|
||||||
interface PrintModuleProps {
|
interface PrintModuleProps {
|
||||||
disabled: boolean;
|
disabled: boolean;
|
||||||
disabledReason?: string | null;
|
|
||||||
printing: boolean;
|
printing: boolean;
|
||||||
onPrint: (printerId: string) => void;
|
onPrint: (printerId: string) => void;
|
||||||
imagesExporting?: boolean;
|
imagesExporting?: boolean;
|
||||||
@@ -33,7 +32,6 @@ interface PrintModuleProps {
|
|||||||
|
|
||||||
export const PrintModule: React.FC<PrintModuleProps> = ({
|
export const PrintModule: React.FC<PrintModuleProps> = ({
|
||||||
disabled,
|
disabled,
|
||||||
disabledReason,
|
|
||||||
printing,
|
printing,
|
||||||
onPrint,
|
onPrint,
|
||||||
imagesExporting = false,
|
imagesExporting = false,
|
||||||
@@ -163,10 +161,6 @@ export const PrintModule: React.FC<PrintModuleProps> = ({
|
|||||||
: '当前浏览器不支持枚举打印机;打印时将打开系统对话框,请在对话框中选择对应打印机。已保存的名称便于下次快速识别。'}
|
: '当前浏览器不支持枚举打印机;打印时将打开系统对话框,请在对话框中选择对应打印机。已保存的名称便于下次快速识别。'}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{disabledReason && disabled && (
|
|
||||||
<p className="text-[10px] text-amber-500/90">{disabledReason}</p>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={handlePrint}
|
onClick={handlePrint}
|
||||||
|
|||||||
Reference in New Issue
Block a user