From 2a509ef4898fc1e02b00af988fb592e6d9abcf81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 十月 2023 18:44:40 +0800
Subject: [PATCH] 2023-10-01
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index a20c959..30385fe 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -448,8 +448,6 @@
let imgCol = false
let columns = btn.verify.columns.filter(col => {
- if (col.output === 'false') return false
-
if (col.type === 'image') {
imgCol = true
}
@@ -464,6 +462,7 @@
if (data && data[0]) {
let errors = []
columns.forEach(col => {
+ if (col.output === 'false') return
if (col.Column && data[0][col.Column] === undefined) {
errors.push(col.Text)
}
@@ -509,7 +508,13 @@
columns.forEach((col, i) => {
let val = item[col.Column]
- if (col.type === 'number' && typeof(val) === 'number') {
+ if (col.output === 'false') {
+ if (col.type === 'number') {
+ val = 0
+ } else {
+ val = ''
+ }
+ } else if (col.type === 'number' && typeof(val) === 'number') {
if (col.abs === 'true') {
val = Math.abs(val)
}
@@ -594,7 +599,13 @@
columns.forEach((col, i) => {
let val = item[col.Column]
- if (col.type === 'number' && typeof(val) === 'number') {
+ if (col.output === 'false') {
+ if (col.type === 'number') {
+ val = 0
+ } else {
+ val = ''
+ }
+ } else if (col.type === 'number' && typeof(val) === 'number') {
if (col.abs === 'true') {
val = Math.abs(val)
}
--
Gitblit v1.8.0