From d5c0a5b70092002345d01a5fd9bcdfeac2e43016 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 七月 2022 23:49:28 +0800
Subject: [PATCH] 2022-07-10

---
 src/views/printTemplate/option.js                    |    4 ++++
 src/views/printTemplate/print.js                     |    1 +
 src/views/printTemplate/mutilform/index.jsx          |   11 ++++++++---
 src/tabviews/zshare/actionList/printbutton/index.jsx |   10 ++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 5d35f3c..632200e 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -931,7 +931,8 @@
       if (!configParam) {
         error = '鎵撳嵃妯℃澘瑙ｆ瀽閿欒锛�'
       } else {
-        let control = configParam.elements.map(element => {
+        let control = []
+        configParam.elements.forEach(element => {
           let _field = element.field
 
           if (_field === 'other_field') {
@@ -967,11 +968,12 @@
             item.Trimming = ''
             if (!item.Width) {
               item.Width = item.BorderSize
-              item.Left = item.Left - item.Width
+              item.Left = item.Left - item.Width + 0.1
             } else if (!item.Height) {
               item.Height = item.BorderSize
-              item.Top = item.Top - item.Height
+              item.Top = item.Top - item.Height + 0.1
             }
+            item.BackColor = element.borderColor
             item.BorderSize = 0
           } else if (item.Type === 'image') {
             item.ImageWidth = element.imgWidth
@@ -1011,7 +1013,7 @@
             }
           }
 
-          return item
+          control.push(item)
         })
 
         _configparam = {
diff --git a/src/views/printTemplate/mutilform/index.jsx b/src/views/printTemplate/mutilform/index.jsx
index 4824e2b..d9d7a0e 100644
--- a/src/views/printTemplate/mutilform/index.jsx
+++ b/src/views/printTemplate/mutilform/index.jsx
@@ -186,7 +186,12 @@
 
         fields.push(
           <Col span={24} key={index}>
-            <Form.Item label={item.label}>
+            <Form.Item label={
+              item.tooltip ? <Tooltip placement="bottomLeft" title={item.tooltip}>
+                <QuestionCircleOutlined className="mk-form-tip" />
+                {item.label}
+              </Tooltip> : item.label
+            }>
               {getFieldDecorator(item.key, {
                 initialValue: item.initval,
                 rules: [
@@ -305,11 +310,11 @@
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 8 }
+        sm: { span: 9 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 16 }
+        sm: { span: 15 }
       }
     }
     return (
diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index 1671000..690ae65 100644
--- a/src/views/printTemplate/option.js
+++ b/src/views/printTemplate/option.js
@@ -425,6 +425,7 @@
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -555,6 +556,7 @@
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -717,6 +719,7 @@
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -863,6 +866,7 @@
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
diff --git a/src/views/printTemplate/print.js b/src/views/printTemplate/print.js
index de60e3d..d6c75cb 100644
--- a/src/views/printTemplate/print.js
+++ b/src/views/printTemplate/print.js
@@ -94,6 +94,7 @@
     // 缁樺埗杈规
     // context.rect(element.left + element.borderSize / 2, element.top + element.borderSize / 2, element.width - element.borderSize, element.height - element.borderSize)
     if (element.borderSize >= 1) {
+      context.beginPath()
       context.strokeStyle = element.borderColor
       context.lineWidth = element.borderSize
       context.rect(element.left, element.top, element.width, element.height)

--
Gitblit v1.8.0