From 5733fc7e386a51217ba6d07e272ca8bd95045abc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 10:14:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/excelout/index.jsx | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/menu/datasource/verifycard/excelout/index.jsx b/src/menu/datasource/verifycard/excelout/index.jsx
index a1fe536..7c90483 100644
--- a/src/menu/datasource/verifycard/excelout/index.jsx
+++ b/src/menu/datasource/verifycard/excelout/index.jsx
@@ -23,6 +23,9 @@
}
let columns = [{
+ Column: 'tb',
+ Text: '琛ㄥ悕'
+ }, {
Column: 'label',
Text: '鍚嶇О'
}, {
@@ -37,6 +40,11 @@
let _header = []
let _topRow = {}
let colwidth = []
+ let tbName = setting.tableName || ''
+
+ if (window.GLOB.externalDatabase !== null) {
+ tbName = tbName.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
columns.forEach(col => {
_header.push(col.Column)
@@ -50,8 +58,11 @@
let _row = {}
columns.forEach((col) => {
- let val = item[col.Column]
- _row[col.Column] = val
+ if (col.Column === 'tb') {
+ _row[col.Column] = tbName
+ } else {
+ _row[col.Column] = item[col.Column]
+ }
})
table.push(_row)
@@ -65,7 +76,7 @@
const wb = XLSX.utils.book_new()
XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
- XLSX.writeFile(wb, `${setting.tableName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
+ XLSX.writeFile(wb, `${tbName}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
}
render() {
--
Gitblit v1.8.0