From 3d4bc79a80eb9cff0f8ef7c53f9685c9ff9fbd2d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 02 九月 2021 23:17:36 +0800 Subject: [PATCH] 2021-09-02 --- src/tabviews/zshare/actionList/printbutton/index.jsx | 90 +++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx index 2902392..e1ae252 100644 --- a/src/tabviews/zshare/actionList/printbutton/index.jsx +++ b/src/tabviews/zshare/actionList/printbutton/index.jsx @@ -211,17 +211,17 @@ let printlist = [] let templates = [] - let printCount = 1 + let printCount = +(formdata.printCount || formdata.PrintCount || formdata.printcount || formdata.Printcount || 1) - if (formdata.printCount && typeof(formdata.printCount) === 'number' && formdata.printCount >= 1) { - printCount = formdata.printCount + if (isNaN(printCount) || printCount < 1) { + printCount = 1 } new Promise(resolve => { if (btn.intertype === 'system') { // 浣跨敤绯荤粺鏃讹紝鐩存帴浠庤〃鏍兼垨琛ㄥ崟涓�夊彇鏁版嵁 let printcell = {} - printcell.printType = formdata.printType || '' + printcell.printType = formdata.printType || formdata.PrintType || formdata.printtype || formdata.Printtype || '' printcell.printCount = printCount printcell.templateID = btn.verify.Template || '' @@ -245,12 +245,13 @@ // 绯荤粺鎵撳嵃鏁版嵁锛屾牎楠宒ata瀛楁 if (btn.verify.printMode !== 'custom' && (!cell.data || cell.data.length === 0)) return - cell.templateID = cell.templateID || btn.verify.Template - cell.printType = cell.printType || formdata.printType || '' + cell.templateID = cell.templateID || cell.TemplateID || cell.Templateid || cell.templateid || btn.verify.Template + cell.printType = cell.printType || cell.PrintType || cell.printtype || cell.Printtype || formdata.printType || formdata.PrintType || formdata.printtype || formdata.Printtype || '' - let _printCount = printCount - if (cell.printCount && typeof(cell.printCount) === 'number' && cell.printCount >= 1) { - _printCount = cell.printCount + let _printCount = +(cell.printCount || cell.PrintCount || cell.printcount || cell.Printcount || 0) + + if (isNaN(_printCount) || _printCount < 1) { + _printCount = printCount } cell.printCount = _printCount @@ -1031,7 +1032,7 @@ task: { taskID: Utils.getuuid(), preview: false, - printer: printer, + printer: printer === 'lackprinter' ? '' : printer, documents: [_cell] } }) @@ -1078,19 +1079,19 @@ return } - let lackItems = printerList.filter(cell => cell.task.printer === 'lackprinter')[0] + // let lackItems = printerList.filter(cell => cell.task.printer === 'lackprinter')[0] if (!socket || socket.readyState !== 1 || socket.url !== 'ws://' + btn.verify.linkUrl) { socket = new WebSocket('ws://' + btn.verify.linkUrl) } else { - if (lackItems) { - let request = { - requestID: '', - version: '', - cmd: 'getPrinters' - } - socket.send(JSON.stringify(request)) - } else { + // if (lackItems) { + // let request = { + // requestID: '', + // version: '', + // cmd: 'getPrinters' + // } + // socket.send(JSON.stringify(request)) + // } else { this.syncMessageSend(printerList) this.execSuccess({ @@ -1099,19 +1100,19 @@ ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��', status: true }) - } + // } } // 鎵撳紑Socket socket.onopen = () =>{ - if (lackItems) { - let request = { - requestID: '', - version: '', - cmd: 'getPrinters' - } - socket.send(JSON.stringify(request)) - } else { + // if (lackItems) { + // let request = { + // requestID: '', + // version: '', + // cmd: 'getPrinters' + // } + // socket.send(JSON.stringify(request)) + // } else { this.syncMessageSend(printerList) this.execSuccess({ @@ -1120,7 +1121,7 @@ ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��', status: true }) - } + // } } // 鐩戝惉娑堟伅 socket.onmessage = (event) => { @@ -1141,23 +1142,24 @@ } } - if (data && data.cmd === 'getPrinters' && data.status) { - printerList = printerList.map(cell => { - if (cell.task.printer === 'lackprinter') { - cell.task.printer = data.defaultPrinter - } - return cell - }) + // if (data && data.cmd === 'getPrinters' && data.status) { + // printerList = printerList.map(cell => { + // if (cell.task.printer === 'lackprinter') { + // cell.task.printer = data.defaultPrinter + // } + // return cell + // }) - this.syncMessageSend(printerList) + // this.syncMessageSend(printerList) - this.execSuccess({ - ErrCode: 'S', - message: '', - ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��', - status: true - }) - } else if (data && data.message && !data.status) { + // this.execSuccess({ + // ErrCode: 'S', + // message: '', + // ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��', + // status: true + // }) + // } else if (data && data.message && !data.status) { + if (data && data.message && !data.status) { this.execError({ ErrCode: 'N', message: data.message, -- Gitblit v1.8.0