diff --git a/package.json b/package.json index e0f34b5..fa7f48e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "JUSTAR", - "version": "2.1.5", + "version": "2.1.6", "description": "钜星科技便民问诊系统", "main": "src/index.js", "scripts": { diff --git a/src/js/main.js b/src/js/main.js index e1660ce..1d2a05f 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -159,7 +159,7 @@ let main ={ } }, { - label:'版本号:2.1.5', + label:'版本号:2.1.6', icon: respath + path.sep+ "static"+ path.sep+"images"+ path.sep+"paste.png", },] }); diff --git a/src/js/module/pdf-to-printer/dist/SumatraPDF-settings.txt b/src/js/module/pdf-to-printer/dist/SumatraPDF-settings.txt index 7de2cff..ec4ef24 100644 --- a/src/js/module/pdf-to-printer/dist/SumatraPDF-settings.txt +++ b/src/js/module/pdf-to-printer/dist/SumatraPDF-settings.txt @@ -1,4 +1,4 @@ -# For documentation, see https://www.sumatrapdfreader.org/settings/settings3-3-1.html +# For documentation, see https://www.sumatrapdfreader.org/settings/settings3.2.html MainWindowBackground = #80fff200 EscToExit = false @@ -13,7 +13,6 @@ FixedPageUI [ SelectionColor = #f5fc0c WindowMargin = 2 4 2 4 PageSpacing = 4 4 - HideScrollbars = false ] EbookUI [ FontName = Georgia @@ -47,9 +46,6 @@ ForwardSearch [ HighlightColor = #6581ff HighlightPermanent = false ] -Annotations [ - HighlightColor = #ffff00 -] CustomScreenDPI = 0 RememberStatePerDocument = true @@ -67,7 +63,6 @@ WindowPos = 0 0 0 0 ShowToc = true SidebarDx = 0 TocDy = 0 -TreeFontSize = 0 ShowStartPage = true UseTabs = true @@ -76,6 +71,6 @@ FileStates [ SessionData [ ] TimeOfLastUpdateCheck = 0 0 -OpenCountWeek = 604 +OpenCountWeek = 523 # Settings after this line have not been recognized by the current version diff --git a/src/js/module/pdf-to-printer/dist/SumatraPDF.exe b/src/js/module/pdf-to-printer/dist/SumatraPDF.exe index a5a4a79..a3dff05 100644 Binary files a/src/js/module/pdf-to-printer/dist/SumatraPDF.exe and b/src/js/module/pdf-to-printer/dist/SumatraPDF.exe differ diff --git a/src/js/module/pdf-to-printer/dist/bundle.js b/src/js/module/pdf-to-printer/dist/bundle.js index f7bc57d..a8cb685 100644 --- a/src/js/module/pdf-to-printer/dist/bundle.js +++ b/src/js/module/pdf-to-printer/dist/bundle.js @@ -1,2 +1 @@ -!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var i in n)("object"==typeof exports?exports:e)[i]=n[i]}}(global,(()=>(()=>{"use strict";var e={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return e.d(n,{a:n}),n},d:(t,n)=>{for(var i in n)e.o(n,i)&&!e.o(t,i)&&Object.defineProperty(t,i,{enumerable:!0,get:n[i]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{getDefaultPrinter:()=>b,getPrinters:()=>x,print:()=>w});const n=require("path");var i=e.n(n);const r=require("fs");var o=e.n(r);const a=require("child_process"),s=require("util"),c=e.n(s)().promisify(a.execFile),u="electron"in process.versions&&process.mainModule&&process.mainModule.filename.includes("app.asar"),l=require("os");var p=e.n(l);function d(){if("win32"!==p().platform())throw"Operating System not supported"}const f=["odd","even"],h=["portrait","landscape"],v=["noscale","shrink","fit"],m=["duplex","duplexshort","duplexlong","simplex"],y=["A2","A3","A4","A5","A6","letter","legal","tabloid","statement"];function w(e,t={}){return n=this,r=void 0,s=function*(){if(d(),!e)throw"No PDF specified";if(!o().existsSync(e))throw"No such file";let n=t.sumatraPdfPath||i().join(__dirname,"SumatraPDF.exe");var r;t.sumatraPdfPath||(r=n,n=u?r.replace("app.asar","app.asar.unpacked"):r);const a=[],{printer:s,silent:l,printDialog:p}=t;p?a.push("-print-dialog"):(s?a.push("-print-to",s):a.push("-print-to-default"),!1!==l&&a.push("-silent"));const w=function(e){const{pages:t,subset:n,orientation:i,scale:r,monochrome:o,side:a,bin:s,paperSize:c,copies:u}=e,l=[];if(t&&l.push(t),n){if(!f.includes(n))throw`Invalid subset provided. Valid names: ${f.join(", ")}`;l.push(n)}if(i){if(!h.includes(i))throw`Invalid orientation provided. Valid names: ${h.join(", ")}`;l.push(i)}if(r){if(!v.includes(r))throw`Invalid scale provided. Valid names: ${v.join(", ")}`;l.push(r)}if(o?l.push("monochrome"):!1===o&&l.push("color"),a){if(!m.includes(a))throw`Invalid side provided. Valid names: ${m.join(", ")}`;l.push(a)}if(s&&l.push(`bin=${s}`),c){if(!y.includes(c))throw`Invalid paper size provided. Valid names: ${y.join(", ")}`;l.push(`paper=${c}`)}return u&&l.push(`${u}x`),l}(t);w.length&&a.push("-print-settings",w.join(",")),a.push(e);try{yield c(n,a)}catch(e){throw e}},new((a=void 0)||(a=Promise))((function(e,t){function i(e){try{c(s.next(e))}catch(e){t(e)}}function o(e){try{c(s.throw(e))}catch(e){t(e)}}function c(t){var n;t.done?e(t.value):(n=t.value,n instanceof a?n:new a((function(e){e(n)}))).then(i,o)}c((s=s.apply(n,r||[])).next())}));var n,r,a,s}function P(e){const t={deviceId:"",name:""};return{isValid:e.split(/\r?\n/).some((e=>{const[n,i]=e.split(":").map((e=>e.trim())),r=n.toLowerCase();return"deviceid"===r&&(t.deviceId=i),"name"===r&&(t.name=i),!(!t.deviceId||!t.name)})),printerData:t}}const x=function(){return e=this,t=void 0,i=function*(){try{d();const{stdout:e}=yield c("Powershell.exe",["chcp 65001;","Get-CimInstance Win32_Printer -Property DeviceID,Name"]);return function(e){const t=[];return e.split(/(\r?\n){2,}/).map((e=>e.trim())).filter((e=>!!e)).forEach((e=>{const{isValid:n,printerData:i}=P(e);n&&t.push(i)})),t}(e)}catch(e){throw e}},new((n=void 0)||(n=Promise))((function(r,o){function a(e){try{c(i.next(e))}catch(e){o(e)}}function s(e){try{c(i.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?r(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(a,s)}c((i=i.apply(e,t||[])).next())}));var e,t,n,i};const b=function(){return e=this,t=void 0,i=function*(){try{d();const{stdout:e}=yield c("Powershell.exe",["chcp 65001;","Get-CimInstance Win32_Printer -Property DeviceID,Name -Filter Default=true"]),t=e.trim();if(!e)return null;const{isValid:n,printerData:i}=P(t);return n?i:null}catch(e){throw e}},new((n=void 0)||(n=Promise))((function(r,o){function a(e){try{c(i.next(e))}catch(e){o(e)}}function s(e){try{c(i.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?r(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(a,s)}c((i=i.apply(e,t||[])).next())}));var e,t,n,i};return t})())); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"bundle.js","mappings":"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","sources":["webpack://pdf-to-printer/webpack/universalModuleDefinition","webpack://pdf-to-printer/webpack/bootstrap","webpack://pdf-to-printer/webpack/runtime/compat get default export","webpack://pdf-to-printer/webpack/runtime/define property getters","webpack://pdf-to-printer/webpack/runtime/hasOwnProperty shorthand","webpack://pdf-to-printer/webpack/runtime/make namespace object","webpack://pdf-to-printer/external node-commonjs \"path\"","webpack://pdf-to-printer/external node-commonjs \"fs\"","webpack://pdf-to-printer/external node-commonjs \"child_process\"","webpack://pdf-to-printer/external node-commonjs \"util\"","webpack://pdf-to-printer/./src/utils/exec-file-async.ts","webpack://pdf-to-printer/./src/utils/electron-util.ts","webpack://pdf-to-printer/external node-commonjs \"os\"","webpack://pdf-to-printer/./src/utils/throw-if-unsupported-os.ts","webpack://pdf-to-printer/./src/print/print.ts","webpack://pdf-to-printer/./src/utils/windows-printer-valid.ts","webpack://pdf-to-printer/./src/get-printers/get-printers.ts","webpack://pdf-to-printer/./src/get-default-printer/get-default-printer.ts"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse {\n\t\tvar a = factory();\n\t\tfor(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n\t}\n})(global, () => {\nreturn ","// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"path\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"fs\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"child_process\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"util\");","import {execFile} from \"child_process\";\nimport util from \"util\";\nconst execFileAsync = util.promisify(execFile);\n\nexport default execFileAsync;\n","// Taken from https://github.com/sindresorhus/electron-util/blob/master/node.js\n\nconst isElectron = \"electron\" in process.versions;\n\nconst isUsingAsar =\n  isElectron &&\n  process.mainModule &&\n  process.mainModule.filename.includes(\"app.asar\");\n\nfunction fixPathForAsarUnpack(path: string): string {\n  return isUsingAsar ? path.replace(\"app.asar\", \"app.asar.unpacked\") : path;\n}\n\nexport default fixPathForAsarUnpack;\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"os\");","import os from \"os\";\n\nexport default function throwIfUnsupportedOs() {\n  if (os.platform() !== \"win32\") {\n    throw \"Operating System not supported\";\n  }\n}\n","import path from \"path\";\nimport fs from \"fs\";\nimport execAsync from \"../utils/exec-file-async\";\nimport fixPathForAsarUnpack from \"../utils/electron-util\";\nimport throwIfUnsupportedOperatingSystem from \"../utils/throw-if-unsupported-os\";\n\nexport interface PrintOptions {\n  printer?: string;\n  pages?: string;\n  subset?: string;\n  orientation?: string;\n  scale?: string;\n  monochrome?: boolean;\n  side?: string;\n  bin?: string;\n  paperSize?: string;\n  silent?: boolean;\n  printDialog?: boolean;\n  sumatraPdfPath?: string;\n  copies?: number;\n}\n\nconst validSubsets = [\"odd\", \"even\"];\nconst validOrientations = [\"portrait\", \"landscape\"];\nconst validScales = [\"noscale\", \"shrink\", \"fit\"];\nconst validSides = [\"duplex\", \"duplexshort\", \"duplexlong\", \"simplex\"];\nconst validPaperSizes = [\n  \"A2\",\n  \"A3\",\n  \"A4\",\n  \"A5\",\n  \"A6\",\n  \"letter\",\n  \"legal\",\n  \"tabloid\",\n  \"statement\",\n];\n\nexport default async function print(\n  pdf: string,\n  options: PrintOptions = {}\n): Promise<void> {\n  throwIfUnsupportedOperatingSystem();\n  if (!pdf) throw \"No PDF specified\";\n  if (!fs.existsSync(pdf)) throw \"No such file\";\n\n  let sumatraPdf =\n    options.sumatraPdfPath || path.join(__dirname, \"SumatraPDF.exe\");\n  if (!options.sumatraPdfPath) sumatraPdf = fixPathForAsarUnpack(sumatraPdf);\n\n  const args: string[] = [];\n\n  const { printer, silent, printDialog } = options;\n\n  if (printDialog) {\n    args.push(\"-print-dialog\");\n  } else {\n    if (printer) {\n      args.push(\"-print-to\", printer);\n    } else {\n      args.push(\"-print-to-default\");\n    }\n    if (silent !== false) {\n      args.push(\"-silent\");\n    }\n  }\n\n  const printSettings = getPrintSettings(options);\n\n  if (printSettings.length) {\n    args.push(\"-print-settings\", printSettings.join(\",\"));\n  }\n\n  args.push(pdf);\n\n  try {\n    await execAsync(sumatraPdf, args);\n  } catch (error) {\n    throw error;\n  }\n}\n\nfunction getPrintSettings(options: PrintOptions): string[] {\n  const {\n    pages,\n    subset,\n    orientation,\n    scale,\n    monochrome,\n    side,\n    bin,\n    paperSize,\n    copies,\n  } = options;\n\n  const printSettings = [];\n\n  if (pages) {\n    printSettings.push(pages);\n  }\n\n  if (subset) {\n    if (validSubsets.includes(subset)) {\n      printSettings.push(subset);\n    } else {\n      throw `Invalid subset provided. Valid names: ${validSubsets.join(\", \")}`;\n    }\n  }\n\n  if (orientation) {\n    if (validOrientations.includes(orientation)) {\n      printSettings.push(orientation);\n    } else {\n      throw `Invalid orientation provided. Valid names: ${validOrientations.join(\n        \", \"\n      )}`;\n    }\n  }\n\n  if (scale) {\n    if (validScales.includes(scale)) {\n      printSettings.push(scale);\n    } else {\n      throw `Invalid scale provided. Valid names: ${validScales.join(\", \")}`;\n    }\n  }\n\n  if (monochrome) {\n    printSettings.push(\"monochrome\");\n  } else if (monochrome === false) {\n    printSettings.push(\"color\");\n  }\n\n  if (side) {\n    if (validSides.includes(side)) {\n      printSettings.push(side);\n    } else {\n      throw `Invalid side provided. Valid names: ${validSides.join(\", \")}`;\n    }\n  }\n\n  if (bin) {\n    printSettings.push(`bin=${bin}`);\n  }\n\n  if (paperSize) {\n    if (validPaperSizes.includes(paperSize)) {\n      printSettings.push(`paper=${paperSize}`);\n    } else {\n      throw `Invalid paper size provided. Valid names: ${validPaperSizes.join(\n        \", \"\n      )}`;\n    }\n  }\n\n  if (copies) {\n    printSettings.push(`${copies}x`);\n  }\n\n  return printSettings;\n}\n","import { Printer } from \"../get-default-printer/get-default-printer\";\n\nexport default function isValidPrinter(printer: string): {\n  isValid: boolean;\n  printerData: Printer;\n} {\n  const printerData: Printer = {\n    deviceId: \"\",\n    name: \"\",\n  };\n\n  const isValid = printer.split(/\\r?\\n/).some((line) => {\n    const [label, value] = line.split(\":\").map((el) => el.trim());\n\n    const lowerLabel = label.toLowerCase();\n\n    // @ts-ignore\n    if (lowerLabel === \"deviceid\") printerData.deviceId = value;\n\n    // @ts-ignore\n    if (lowerLabel === \"name\") printerData.name = value;\n\n    return !!(printerData.deviceId && printerData.name);\n  });\n\n  return {\n    isValid,\n    printerData,\n  };\n}\n","import execFileAsync from \"../utils/exec-file-async\";\nimport isValidPrinter from \"../utils/windows-printer-valid\";\nimport throwIfUnsupportedOperatingSystem from \"../utils/throw-if-unsupported-os\";\nimport { Printer } from \"../get-default-printer/get-default-printer\";\n\nasync function getPrinters(): Promise<Printer[]> {\n  function stdoutHandler(stdout: string) {\n    const printers: Printer[] = [];\n\n    stdout\n      .split(/(\\r?\\n){2,}/)\n      .map((printer) => printer.trim())\n      .filter((printer) => !!printer)\n      .forEach((printer) => {\n        const { isValid, printerData } = isValidPrinter(printer);\n\n        if (!isValid) return;\n\n        printers.push(printerData);\n      });\n\n    return printers;\n  }\n\n  try {\n    throwIfUnsupportedOperatingSystem();\n    const { stdout } = await execFileAsync(\"Powershell.exe\", [\n      \"chcp 65001;\",\n      \"Get-CimInstance Win32_Printer -Property DeviceID,Name\",\n    ]);\n    return stdoutHandler(stdout);\n  } catch (error) {\n    throw error;\n  }\n}\n\nexport default getPrinters;\n","import execFileAsync from \"../utils/exec-file-async\";\nimport throwIfUnsupportedOperatingSystem from \"../utils/throw-if-unsupported-os\";\nimport isValidPrinter from \"../utils/windows-printer-valid\";\n\nexport interface Printer {\n  deviceId: string;\n  name: string;\n}\n\nasync function getDefaultPrinter(): Promise<Printer | null> {\n  try {\n    throwIfUnsupportedOperatingSystem();\n\n    const { stdout } = await execFileAsync(\"Powershell.exe\", [\n      \"chcp 65001;\",\n      \"Get-CimInstance Win32_Printer -Property DeviceID,Name -Filter Default=true\",\n    ]);\n\n    const printer = stdout.trim();\n\n    // If stdout is empty, there is no default printer\n    if (!stdout) return null;\n\n    const { isValid, printerData } = isValidPrinter(printer);\n\n    // DeviceID or Name not found\n    if (!isValid) return null;\n\n    return printerData;\n  } catch (error) {\n    throw error;\n  }\n}\n\nexport default getDefaultPrinter;\n"],"names":["root","factory","exports","module","define","amd","a","i","global","__webpack_require__","getter","__esModule","d","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","require","execFile","isUsingAsar","process","versions","mainModule","filename","includes","throwIfUnsupportedOs","validSubsets","validOrientations","validScales","validSides","validPaperSizes","print","pdf","options","sumatraPdf","sumatraPdfPath","__dirname","path","replace","args","printer","silent","printDialog","push","printSettings","pages","subset","orientation","scale","monochrome","side","bin","paperSize","copies","join","getPrintSettings","length","error","isValidPrinter","printerData","deviceId","name","isValid","split","some","line","label","map","el","trim","lowerLabel","toLowerCase","stdout","printers","filter","forEach","stdoutHandler"],"sourceRoot":""} \ No newline at end of file +!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r=e();for(var n in r)("object"==typeof exports?exports:t)[n]=r[n]}}(global,(function(){return function(t){var e={};function r(n){if(e[n])return e[n].exports;var i=e[n]={i:n,l:!1,exports:{}};return t[n].call(i.exports,i,i.exports,r),i.l=!0,i.exports}return r.m=t,r.c=e,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(t,e){if(1&e&&(t=r(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)r.d(n,i,function(e){return t[e]}.bind(null,i));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=2)}([function(t,e,r){"use strict";const{execFile:n}=r(5);t.exports=(t,e=[],r)=>new Promise((i,o)=>{n(t,e,(t,e)=>{t?o(t):i(r?r(e):e)})})},function(t,e){t.exports=require("fs")},function(t,e,r){"use strict";switch(r(3).platform()){case"darwin":case"linux":t.exports={print:r(4),getPrinters:r(6),getDefaultPrinter:r(7)};break;case"win32":t.exports={print:r(8),getPrinters:r(11),getDefaultPrinter:r(12)};break;default:!function(){throw new Error("Platform not supported")}()}},function(t,e){t.exports=require("os")},function(t,e,r){"use strict";const n=r(1),i=r(0);t.exports=(t,e={})=>{if(!t)throw"No PDF specified";if("string"!=typeof t)throw"Invalid PDF name";if(!n.existsSync(t))throw"No such file";const r=[t],{printer:o,unix:s}=e;if(o&&r.push("-d",o),s){if(!Array.isArray(s))throw"options.unix should be an array";s.map(t=>r.push(...t.split(" ")))}return i("lp",r)}},function(t,e){t.exports=require("child_process")},function(t,e,r){"use strict";const n=r(0);t.exports=()=>n("lpstat",["-a"],t=>t.trim().split("\n").map(t=>t.substr(0,t.indexOf(" "))))},function(t,e,r){"use strict";const n=r(0);t.exports=()=>n("lpstat",["-d"],t=>t.substr(t.indexOf(":")+1).trim())},function(t,e,r){"use strict";const n=r(9),i=r(1),o=r(0),{fixPathForAsarUnpack:s}=r(10);t.exports=(t,e={})=>{if(!t)throw"No PDF specified";if("string"!=typeof t)throw"Invalid PDF name";if(!i.existsSync(t))throw"No such file";let r=n.join(__dirname,"SumatraPDF.exe");r=s(r);const u=[],{printer:c,win32:p}=e;if(p){if(!Array.isArray(p))throw"options.win32 should be an array";p.map(t=>u.push(...t.split(" ")))}else c?u.push("-print-to",c):u.push("-print-to-default"),u.push("-silent");return u.push(t),o(r,u)}},function(t,e){t.exports=require("path")},function(t,e,r){"use strict";r.r(e),r.d(e,"fixPathForAsarUnpack",(function(){return n}));"electron"in process.versions&&process.mainModule&&process.mainModule.filename.includes("app.asar");const n=t=>t.replace("/app.asar","")},function(t,e,r){"use strict";const n=r(0);t.exports=()=>n("wmic",["printer","get","name"],t=>t.trim().split(/\s*[\r\n]+/).slice(1))},function(t,e,r){"use strict";const n=r(0);t.exports=()=>n("wmic",["printer","get","name,default"],t=>{const e=t.trim().split(/\s*[\r\n]+/).slice(1).filter(t=>0===t.indexOf("TRUE"));return 0===e.length?"":e[0].replace(/TRUE\s+/,"")})}])})); \ No newline at end of file diff --git a/src/js/module/pdf-to-printer/dist/types.d.ts b/src/js/module/pdf-to-printer/dist/types.d.ts new file mode 100644 index 0000000..a845a5b --- /dev/null +++ b/src/js/module/pdf-to-printer/dist/types.d.ts @@ -0,0 +1,11 @@ +export interface Options { + printer?: string; + unix?: string[]; + win32?: string[]; +} + +export function print(path: string, options?: any): Promise; + +export function getPrinters(): Promise; + +export function getDefaultPrinter(): Promise; diff --git a/src/js/setting/print_monitor.js b/src/js/setting/print_monitor.js index 3b1e664..0d900b0 100644 --- a/src/js/setting/print_monitor.js +++ b/src/js/setting/print_monitor.js @@ -63,8 +63,8 @@ let print_monitor={ print_operation.getPrinterList().then(listPrinter => { return listPrinter }).then(listPrinter => { - print_operation.getDefaultPrinter().then(defaultPrinter => { let data ={} + let defaultPrinter; //获取打印缓存 print_url = os.homedir()+path.sep+"AppData/Local/justarData/print/print.json" log.info("打印机缓存文件:"+print_url); @@ -89,7 +89,6 @@ let print_monitor={ }else{ data = { listPrinter: listPrinter, - defaultPrinter: defaultPrinter.name, pdf_url: pdf_url } win.show(); @@ -98,7 +97,6 @@ let print_monitor={ win.webContents.send('printerData', json_data); } - }); }); }) }, diff --git a/src/views/list_printer.html b/src/views/list_printer.html index 3df5f46..4ff8802 100644 --- a/src/views/list_printer.html +++ b/src/views/list_printer.html @@ -100,14 +100,15 @@ let html = []; for (const printer of data.listPrinter) { if (printer.name === defaultPrinter) { - html.push(` -  ${printer.name} + html.push(` +  ${printer} `) + printData.printer = printer; continue; } - html.push(` -  ${printer.name} + html.push(` +  ${printer} `) }