From 241f177ee649732c536b11da65972d5cca6f0f43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:20:19 +0800
Subject: [PATCH] 2023-12-10
---
src/views/billprint/index.jsx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 4ef6821..0c287de 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -395,6 +395,10 @@
} else {
item.IsSort = 'false'
}
+
+ if (item.marks && item.marks.length === 0) {
+ item.marks = null
+ }
return true
})
@@ -461,6 +465,11 @@
if (!component.format) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
component.setting.arr_field = component.columns ? component.columns.map(col => col.field).join(',') : ''
+ component.setting.laypage = false // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
+
+ if (component.format === 'object') {
+ component.setting.$top = true
+ }
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
@@ -484,7 +493,6 @@
delete component.scripts
component.setting.execute = component.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
- component.setting.laypage = false // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
component.setting.onload = 'true' // 榛樿鍔犺浇
if (!component.setting.execute) {
@@ -610,6 +618,10 @@
if (cell.style.display === 'inline-block') {
cell.style.verticalAlign = 'top'
}
+
+ if (cell.marks && cell.marks.length === 0) {
+ cell.marks = null
+ }
if (['text', 'number', 'formula'].includes(cell.eleType)) {
cell.innerHeight = cell.innerHeight || 'auto'
@@ -673,7 +685,8 @@
inter.setting.$name = '鍏叡鏁版嵁婧�-' + inter.setting.name
inter.setting.execute = inter.setting.execute !== 'false'
- inter.setting.laypage = true
+ inter.setting.laypage = false
+ inter.setting.$top = true
if (!inter.setting.execute) {
inter.setting.dataresource = ''
--
Gitblit v1.8.0