From e9e8b1c7b481415714fff9a0d83099fd5a7d6ff0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 五月 2023 17:25:11 +0800
Subject: [PATCH] 2023-05-18

---
 src/views/billprint/index.jsx |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 1757a88..de28f47 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -333,19 +333,27 @@
 
           if (component.type === 'table') {
             let getColumns = (cols) => {
-              return cols.map(item => {
+              return cols.filter(item => {
                 if (item.type === 'colspan') {
                   item.subcols = getColumns(item.subcols)
+                  if (item.subcols.length === 0) {
+                    return false
+                  }
                 } else if (item.type === 'custom') {
-                  item.elements = item.elements.map(cell => {
+                  item.elements = item.elements.filter(cell => {
+                    if (cell.eleType === 'button') return false
+
                     cell = this.resetElement(cell)
                     return cell
                   })
+                  if (item.elements.length === 0) {
+                    return false
+                  }
                 } else {
                   item.IsSort = 'false'
                 }
           
-                return item
+                return true
               })
             }
             component.cols = getColumns(component.cols)

--
Gitblit v1.8.0