From 0293adcec6042961d5071e01c0d4a9a4b5c17562 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 11 一月 2021 19:03:19 +0800
Subject: [PATCH] 2021-01-11
---
src/tabviews/zshare/verifycard/index.jsx | 6 ++++--
src/tabviews/scriptmanage/index.jsx | 6 ++++--
src/tabviews/subtable/index.jsx | 6 ++++--
src/tabviews/subtabtable/index.jsx | 6 ++++--
src/tabviews/verupmanage/subtabtable/index.jsx | 6 ++++--
src/tabviews/commontable/index.jsx | 6 ++++--
src/tabviews/zshare/normalTable/index.jsx | 2 --
src/tabviews/verupmanage/index.jsx | 6 ++++--
8 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 341926f..9a7f5fd 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -312,8 +312,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/scriptmanage/index.jsx b/src/tabviews/scriptmanage/index.jsx
index 8e48202..64395fb 100644
--- a/src/tabviews/scriptmanage/index.jsx
+++ b/src/tabviews/scriptmanage/index.jsx
@@ -86,8 +86,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index dabe4b3..eb8c555 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -242,8 +242,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 302c278..f1a937b 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -203,8 +203,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/verupmanage/index.jsx b/src/tabviews/verupmanage/index.jsx
index 34cb622..4c16746 100644
--- a/src/tabviews/verupmanage/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -91,8 +91,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index c16e0d0..553cb4a 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -113,8 +113,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 8739fbb..0d1e6dd 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -75,7 +75,6 @@
let cell = null
if (item.type === 'colspan') {
- if (!item.subcols || item.subcols.length === 0) return
cell = {title: item.label, children: []}
item.subcols.forEach(col => {
@@ -111,7 +110,6 @@
})
})
} else if (item.type === 'old_colspan') {
- if (!item.subcols || item.subcols.length === 0) return
item.subcols.forEach(col => {
if (col.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
col.marks = col.marks.filter(mark => {
diff --git a/src/tabviews/zshare/verifycard/index.jsx b/src/tabviews/zshare/verifycard/index.jsx
index dff26d2..ae9e1d4 100644
--- a/src/tabviews/zshare/verifycard/index.jsx
+++ b/src/tabviews/zshare/verifycard/index.jsx
@@ -180,8 +180,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
--
Gitblit v1.8.0