From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 1667d62..af9100d 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -484,7 +484,14 @@
}
try {
- if (imgCol) {
+ if (btn.verify.excelHandle === 'true') {
+ // eslint-disable-next-line
+ let func = new Function('XLSX', 'data', 'columns', 'callback', btn.verify.excel_func)
+ func(XLSX, data, columns, (res) => {
+ res = res || {ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'}
+ this.execSuccess(res)
+ })
+ } else if (imgCol) {
const column = columns.map(item => {
let col = {
title: item.Text,
@@ -678,6 +685,7 @@
this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
}
} catch (e) {
+ console.warn(e)
this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
}
}
--
Gitblit v1.8.0