From 20185ab64a165df51515d9fa1c9b12a7a8c55f59 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 四月 2023 23:11:04 +0800
Subject: [PATCH] 2023-04-07
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 5615c35..2192239 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -42,7 +42,7 @@
this.setState({hidden: true})
} else {
let s = BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+ if (btn.controlVals.includes(s)) {
this.setState({hidden: true})
} else {
this.setState({hidden: false})
@@ -71,7 +71,7 @@
this.setState({hidden: true})
} else {
let s = nextProps.BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+ if (btn.controlVals.includes(s)) {
this.setState({hidden: true})
} else {
this.setState({hidden: false})
@@ -713,6 +713,21 @@
})
}
+ if (btn.verify.wrapText === 'true' && data) {
+ let lines = data.length + 1
+ let start = 2
+ if (btn.verify.merge === 'true') {
+ lines = data.length + 2
+ }
+ for (let n = 0; n < cols.length; n++) {
+ for (let m = start; m <= lines; m++) {
+ if (ws[cols[n] + m] && !ws[cols[n] + m].s) {
+ ws[cols[n] + m].s = {alignment: { wrapText: true }}
+ }
+ }
+ }
+ }
+
// ws["A1"].s = {fill: { bgColor: { rgb: "FFFFAA" }}, font: { color: { rgb: "1890FF" } }}
const wb = XLSX.utils.book_new()
@@ -922,6 +937,11 @@
menuname: btn.logLabel
}
+ if (btn.verify.dataType !== 'custom' && setting.sub_field) {
+ arr_field = arr_field + ',' + setting.sub_field
+ param.arr_field = arr_field
+ }
+
// 鏁版嵁绠＄悊鏉冮檺
if (sessionStorage.getItem('dataM') === 'true') {
param.dataM = 'Y'
--
Gitblit v1.8.0