优化:使用Ctrl+P一键打印,使用弹出式页面避免打印速度过慢

src/Add-on/Print.ts

@@ -857,7 +857,7 @@ async function PrintImage3(ens: Entity[])
 
 export function GetPrintWindow()
 {
-    const win = window.open();
+    const win = window.open('', '', 'status=1,menubar=yes,toolbar=yes');
     if (!win)
     {
         app.Editor.Prompt("无法弹出新的窗口,请允许新窗口弹出!(地址栏右侧)");
@@ -977,7 +977,7 @@ export async function GetImgElement(ens: Entity[], isReset = true)
         f.Reset();
         app.Viewer.CameraCtrl.ReadFile(f);
         app.Viewer.OnSize();
-        app.Viewer.Render();
+        app.Viewer.UpdateRender();
     }
 
     let div = document.createElement("div");

src/Add-on/Viewport/OneKeyPrint.ts

@@ -89,7 +89,8 @@ export class OneKeyPrint implements Command
             });
             return;
         }
-        win.document.body.innerText = "正在生成图纸,请稍等...";
+        win.document.title = "按Ctrl+P打印";
+        win.document.body.innerText = "生成后请按Ctrl+P打印,正在生成图纸,请稍等...";
         const frag = document.createDocumentFragment();
 
 
@@ -101,14 +102,27 @@ export class OneKeyPrint implements Command
         app.Viewer.CameraCtrl.WriteFile(f);
         let vpsbak = app.Viewer.ViewPorts;
 
+        let i = 1;
+        let count = framesGrounps.size;
         for (let [, { entitys }] of framesGrounps)
         {
             let div = await GetImgElement(entitys, false);
             frag.append(div);
+
+            win.document.body.innerText = `生成后请按Ctrl+P打印,正在生成图纸(${i}/${count}),请稍等...`;
+            i++;
         }
         win.document.body.innerText = "";
         win.document.body.append(frag);
 
+        // setTimeout(() =>
+        // {
+        //     // chrome90如果自动调用这个,那么卡死
+        //     // win.focus();
+        //     // win.print();
+        //     // win.close();
+        // }, 100);
+
         //还原视图
         [app.Viewer.Scene, sceneBak] = [sceneBak, app.Viewer.Scene];
         app.Viewer.Renderer.setClearColor(clearColorBak);

src/ApplicationServices/Application.ts

@@ -194,7 +194,7 @@ export class ApplicationService
                 e.preventDefault();
                 commandMachine.ExecCommand("COMANP");
             }
-            if (app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft))
+            if (app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft) || app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlRight))
             {
                 if (e.code === KeyCode.KeyZ)
                 {
@@ -221,6 +221,12 @@ export class ApplicationService
                 {
                     commandMachine.ExecCommand(CommandNames.Save);
                 }
+                else if (e.code === KeyCode.KeyP)
+                {
+                    commandMachine.ExecCommand(CommandNames.OneKeyPrint);
+                    e.preventDefault();
+                    e.stopPropagation();
+                }
                 else if (e.code === KeyCode.KeyE)
                 {
                     if (app.Editor.KeyCtrl.KeyIsDown(KeyCode.AltLeft))

src/Common/KeyEnum.ts

@@ -256,6 +256,7 @@ export enum KeyCode
     CapsLock = "CapsLock",
     Control = "Control",
     ControlLeft = "ControlLeft",
+    ControlRight = "ControlRight",
 
     /**
      * win左键

src/UI/Layout/ApplicationLayout.tsx

@@ -16,7 +16,6 @@ import { ZINDEX } from '../../Common/ZIndex';
 import { Entity } from '../../DatabaseServices/Entity/Entity';
 import { FileServer } from '../../DatabaseServices/FileServer';
 import { registerCommand } from '../../Editor/CommandRegister';
-import { SelectSetBase } from '../../Editor/SelectBase';
 import { CameraControlBtn, CameraControlBtnStore } from '../Components/CameraControlButton/CameraControlBtn';
 import { MainContent } from '../Components/MainContent/MainContent';
 import { MaterialContainer, MaterialContainerProps } from '../Components/MaterialContainer';