From 7d12548067e400897315504cf6926a53eba6b77e Mon Sep 17 00:00:00 2001 From: Alexey Zinoviev Date: Mon, 29 Apr 2024 11:40:10 +0400 Subject: [PATCH] EZQMS-762: Improve printing layout (#5486) Improve printing layout --- packages/panel/src/components/Panel.svelte | 14 ++++- .../components/CollaborativeTextEditor.svelte | 2 +- .../src/components/toc/TableOfContents.svelte | 2 +- packages/theme/styles/_print.scss | 21 +++++++ packages/theme/styles/global.scss | 5 ++ packages/theme/styles/panel.scss | 24 ++++++++ packages/ui/src/components/Panel.svelte | 57 ++++++++++++++----- .../ui/src/components/PanelInstance.svelte | 13 +++++ packages/ui/src/components/Scroller.svelte | 4 ++ packages/ui/src/components/TabsControl.svelte | 2 +- .../ui/src/components/internal/Root.svelte | 5 ++ .../src/components/AttachmentRefInput.svelte | 2 +- .../src/components/EditDoc.svelte | 1 + .../src/components/Guest.svelte | 6 ++ .../components/issues/edit/EditIssue.svelte | 1 + .../issues/edit/QueryIssuesList.svelte | 2 +- .../src/components/Workbench.svelte | 10 +++- 17 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 packages/theme/styles/_print.scss diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte index 543118bef5..59f5077f53 100644 --- a/packages/panel/src/components/Panel.svelte +++ b/packages/panel/src/components/Panel.svelte @@ -45,6 +45,8 @@ export let customAside: ButtonItem[] | undefined = undefined export let selectedAside: string | boolean = customAside ? customAside[0].id : isAside export let kind: 'default' | 'modern' = 'default' + export let printHeader = true + export let printAside = false export function getAside (): string | boolean { return panel.getAside() @@ -109,6 +111,8 @@ bind:useMaxWidth {isFullSize} {customAside} + {printHeader} + {printAside} bind:selectedAside on:select={(result) => { selectedAside = result.detail @@ -131,7 +135,7 @@ {#if isUtils && $$slots.utils} -
+
{/if} @@ -183,6 +187,14 @@ + + + + + + + + {#if $deviceInfo.isMobile}
diff --git a/packages/text-editor/src/components/CollaborativeTextEditor.svelte b/packages/text-editor/src/components/CollaborativeTextEditor.svelte index 666381eb00..049e824883 100644 --- a/packages/text-editor/src/components/CollaborativeTextEditor.svelte +++ b/packages/text-editor/src/components/CollaborativeTextEditor.svelte @@ -562,7 +562,7 @@
{#if refActions.length > 0} -
+
{#each refActions as a} {/if} {/if} -
+
{#if hasSubIssues} {/if} diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte index 77254bcf4b..b09db7e41e 100644 --- a/plugins/workbench-resources/src/components/Workbench.svelte +++ b/plugins/workbench-resources/src/components/Workbench.svelte @@ -646,7 +646,7 @@ class:modern-app={modern} style:flex-direction={appsDirection === 'horizontal' ? 'column-reverse' : 'row'} > -
+
{#if navFloat}
(visibleNav = false)} />{/if} -
+
{#if currentApplication} @@ -1017,4 +1017,10 @@ } } } + + @media print { + .workbench-container:has(~ .panel-instance) { + display: none; + } + }