From 0e274944e11094012aa2e1557df8fe438b3b6d20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十二月 2021 14:25:13 +0800
Subject: [PATCH] 2021-12-14

---
 src/views/printTemplate/print.js |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/views/printTemplate/print.js b/src/views/printTemplate/print.js
index 81c5792..de60e3d 100644
--- a/src/views/printTemplate/print.js
+++ b/src/views/printTemplate/print.js
@@ -36,6 +36,13 @@
           element.fontSize = element.fontSize * sizeradio
         } else if (element.type === 'qrcode') {
           element.qrcodeWidth = element.qrcodeWidth * ratio
+
+          if (element.qrcodeWidth > element.height) {
+            element.qrcodeWidth = element.height
+          }
+          if (element.qrcodeWidth > element.width) {
+            element.qrcodeWidth = element.width
+          }
         } else if (element.type === 'image') {
           element.imgWidth = element.imgWidth * ratio
           element.imgHeight = element.imgHeight * ratio
@@ -70,9 +77,15 @@
       context.translate(-_cx, -_cy) // 鎭㈠鍘熺偣
     }
 
-    if (debug || selectId === element.uuid) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
+    if (selectId === element.uuid) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
       context.shadowBlur = 5
       context.shadowColor = '#1890ff'
+      context.fillStyle = 'white'
+      context.fillRect(element.left, element.top, element.width || 1, element.height || 1)
+      context.shadowBlur = 0
+    } else if (debug) {
+      context.shadowBlur = 3
+      context.shadowColor = 'orange'
       context.fillStyle = 'white'
       context.fillRect(element.left, element.top, element.width || 1, element.height || 1)
       context.shadowBlur = 0
@@ -104,7 +117,7 @@
       context.fillRect(element.left, element.top, element.width, element.height)
     }
 
-    if ((debug || selectId === element.uuid) && element.width > 3 * ratio && element.height > 3 * ratio) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
+    if (selectId === element.uuid && element.width > 3 * ratio && element.height > 3 * ratio) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
       context.strokeStyle = '#1890ff'
       context.beginPath()
       context.moveTo(element.left + element.width - 7, element.top + element.height - 2)
@@ -131,6 +144,14 @@
       context.fillStyle = element.fontColor
 
       let lines = element.value.split('\n')
+
+      if (!element.value && element.field) {
+        if (element.field === 'other_field') {
+          lines = [element.cusfield || '']
+        } else {
+          lines = [element.field]
+        }
+      }
       let _y = element.top + element.padding + element.fontSize + element.borderSize
       let _left = element.left + element.borderSize + element.padding
       let _right = element.left + element.width - element.padding - element.borderSize

--
Gitblit v1.8.0