@nstc-business/imes 1.1.10 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/measureCalc/index.vue

@@ -1209,42 +1209,70 @@ export default {
     },
     /**
      * 解析打印/下载文件名（不含 .pdf）
-     * 时间：2026-10-29 17:27:04
+     * 时间：2026-10-29 18:30:29
      * 人员：AI && 徐红飞
      * 入参：无
-     * 出参：文件名基名
-     * 方法内容：优先 downloadFileName，否则 model.code，再否则「测算结果」
+     * 出参：文件名基名（已清洗非法字符）
+     * 方法内容：优先 downloadFileName，否则 model.code；统一清洗 \/:*?"<>| 供下载与打印共用
      */
     resolvePrintFileBaseName() {
       const raw = this.downloadFileName || (this.model && this.model.code) || '测算结果'
-      return String(raw).replace(/\.pdf$/i, '')
+      return String(raw)
+        .replace(/\.pdf$/i, '')
+        .replace(/[\\/:*?"<>|]/g, '_')
+        .trim() || '测算结果'
     },
     /**
      * 带文件名打印 PDF（base64）
-     * 时间：2026-10-29 18:16:00
+     * 时间：2026-10-29 18:30:29
      * 人员：AI && 徐红飞
      * 入参：base64 - PDF 内容；fileBaseName - 另存为预填名（不含 .pdf）
      * 出参：无
-     * 方法内容：用 HTML iframe + title + embed 打印，规避 PDF blob 直接打印时另存为文件名为空
+     * 方法内容：HTML iframe+title+embed 打印；等 embed load 后再 print；afterprint/长兜底再 cleanup，避免另存为未完成就 revoke
      */
     printPdfWithFileName(base64, fileBaseName) {
-      const title = String(fileBaseName || '测算结果').replace(/[\\/:*?"<>|]/g, '_')
+      const title = String(fileBaseName || '测算结果').replace(/[\\/:*?"<>|]/g, '_').trim() || '测算结果'
       const pure = String(base64 || '').replace(/^data:application\/pdf;base64,/, '')
-      const binary = atob(pure)
-      const len = binary.length
-      const bytes = new Uint8Array(len)
-      for (let i = 0; i < len; i++) {
-        bytes[i] = binary.charCodeAt(i)
+      let bytes
+      try {
+        const binary = atob(pure)
+        const len = binary.length
+        bytes = new Uint8Array(len)
+        for (let i = 0; i < len; i++) {
+          bytes[i] = binary.charCodeAt(i)
+        }
+      } catch (e) {
+        printJS({
+          printable: pure,
+          type: 'pdf',
+          base64: true,
+          documentTitle: title
+        })
+        return
       }
       const blob = new Blob([bytes], { type: 'application/pdf' })
       const pdfUrl = URL.createObjectURL(blob)
       const iframe = document.createElement('iframe')
+      // 非零屏外尺寸：部分 Edge 对 0x0 iframe 打印/另存为不稳定
       iframe.setAttribute(
         'style',
-        'position:fixed;right:0;bottom:0;width:0;height:0;border:0;visibility:hidden'
+        'position:fixed;left:-9999px;top:0;width:800px;height:600px;border:0;opacity:0;pointer-events:none'
       )
       document.body.appendChild(iframe)
       const frameWin = iframe.contentWindow
+      if (!frameWin) {
+        URL.revokeObjectURL(pdfUrl)
+        if (iframe.parentNode) {
+          iframe.parentNode.removeChild(iframe)
+        }
+        printJS({
+          printable: pure,
+          type: 'pdf',
+          base64: true,
+          documentTitle: title
+        })
+        return
+      }
       const frameDoc = frameWin.document
       const safeTitle = title
         .replace(/&/g, '&amp;')
@@ -1254,10 +1282,21 @@ export default {
       frameDoc.open()
       frameDoc.write(
         `<!DOCTYPE html><html><head><meta charset="utf-8"><title>${safeTitle}</title></head>` +
-          `<body style="margin:0"><embed src="${pdfUrl}" type="application/pdf" width="100%" height="100%" /></body></html>`
+          `<body style="margin:0"><embed id="pdfEmbed" src="${pdfUrl}" type="application/pdf" width="100%" height="100%" /></body></html>`
       )
       frameDoc.close()
+
+      let cleaned = false
       const cleanup = () => {
+        if (cleaned) {
+          return
+        }
+        cleaned = true
+        try {
+          frameWin.removeEventListener('afterprint', onAfterPrint)
+        } catch (e) {
+          /* ignore */
+        }
         try {
           if (iframe.parentNode) {
             iframe.parentNode.removeChild(iframe)
@@ -1267,23 +1306,42 @@ export default {
         }
         URL.revokeObjectURL(pdfUrl)
       }
+      const onAfterPrint = () => {
+        cleanup()
+      }
       const doPrint = () => {
         try {
+          frameWin.addEventListener('afterprint', onAfterPrint)
           frameWin.focus()
           frameWin.print()
         } catch (e) {
-          // 回退 printJS（可能仍无文件名，但保证能打）
           printJS({
             printable: pure,
             type: 'pdf',
             base64: true,
             documentTitle: title
           })
+          cleanup()
+          return
         }
-        setTimeout(cleanup, 2000)
+        // 另存为对话框可能远超数秒；afterprint 优先，60s 兜底防泄漏
+        setTimeout(cleanup, 60000)
+      }
+
+      const embed = frameDoc.getElementById('pdfEmbed')
+      let printed = false
+      const tryPrint = () => {
+        if (printed) {
+          return
+        }
+        printed = true
+        doPrint()
+      }
+      if (embed) {
+        embed.addEventListener('load', tryPrint)
       }
-      // embed 加载需要一点时间；onload 在部分浏览器对 srcdoc/write 不可靠，用延时兜底
-      setTimeout(doPrint, 400)
+      // embed load 在部分浏览器不可靠，最长等 3s 再打
+      setTimeout(tryPrint, 3000)
     },
     downloadPdfBase64(base64) {
       const pure = String(base64 || '').replace(/^data:application\/pdf;base64,/, '')