From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
web/src/commonJS/commonFile.js | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/web/src/commonJS/commonFile.js b/web/src/commonJS/commonFile.js
index 7599513..1c82f2f 100644
--- a/web/src/commonJS/commonFile.js
+++ b/web/src/commonJS/commonFile.js
@@ -28,9 +28,10 @@
} else if (suffixName == 'xls' || suffixName == 'xlsx') {
const response = await http.get('/sys/oss/content2', {params: formData, responseType: 'blob'});
const arrayBuffer = await response.arrayBuffer();
- LuckyExcel.transformExcelToLucky(
- arrayBuffer,
- function (exportJson, luckysheetfile) {
+ // 浣跨敤 LuckyExcel 杞崲 Excel 鏂囦欢鏁版嵁
+ LuckyExcel.transformExcelToLucky(arrayBuffer, function (exportJson, luckysheetfile) {
+ try {
+ // 浣跨敤 Luckysheet 娓叉煋琛ㄦ牸
luckysheet.create({
container: pageMarkerfun,
data: exportJson.sheets,
@@ -38,7 +39,10 @@
showtoolbar: false,
showinfobar: false,
});
- })
+ } catch (err) {
+ console.error('娓叉煋 Luckysheet 鏃跺嚭閿�:', err);
+ }
+ });
} else {
alert("鏂囦欢绫诲瀷涓嶆敮鎸侀瑙�");
}
@@ -49,13 +53,12 @@
}
-
function setAccessoryFormatComm(row, pageMarker, that) {
if (row.accessoryMap) {
let data = '';
// 瀹氫箟 title 鍑芥暟
- window.titleName = async function(suffixName, fileName) {
+ window.titleName = async function (suffixName, fileName) {
if (suffixName == 'pdf') {
that.pdfName = fileName;
} else if (suffixName == 'doc' || suffixName == 'docx') {
@@ -106,7 +109,7 @@
}
-function setAccessoryFormat2(row, pageMarker,that) {
+function setAccessoryFormatSingle(row, pageMarker, that) {
if (row.accessoryMap) {
let data = '';
for (let key in row.accessoryMap) {
@@ -123,16 +126,16 @@
if (suffixName == 'pdf' || suffixName == 'doc' || suffixName == 'docx' || suffixName == 'jpg' || suffixName == 'jpeg' || suffixName == 'png' || suffixName == 'xls' || suffixName == 'xlsx') {
if (suffixName == 'pdf') {
pageMarker2 = pageMarker + '-pdf'
- that.pdfName =fileName;
+ that.pdfName = fileName;
} else if (suffixName == 'doc' || suffixName == 'docx') {
pageMarker2 = pageMarker + '-doc'
- that.docName =fileName;
+ that.docName = fileName;
} else if (suffixName == 'jpg' || suffixName == 'jpeg' || suffixName == 'png') {
pageMarker2 = pageMarker + '-img'
- that.imgName =fileName;
+ that.imgName = fileName;
} else if (suffixName == 'xls' || suffixName == 'xlsx') {
pageMarker2 = pageMarker + '-xls'
- that.xlsName =fileName;
+ that.xlsName = fileName;
}
return openPreviewDialog(fileId, suffixName, document.getElementById(pageMarker2), pageMarker2);
} else {
@@ -145,7 +148,7 @@
}
}
-function setAccessoryFormat3(row, pageMarker,that) {
+function setAccessoryFormatByForm(row, pageMarker, that) {
if (row.files.groups[0].fields[0].files[0]) {
let data = '';
let url = row.files.groups[0].fields[0].files[0].url;
@@ -160,16 +163,16 @@
if (suffixName == 'pdf' || suffixName == 'doc' || suffixName == 'docx' || suffixName == 'jpg' || suffixName == 'jpeg' || suffixName == 'png' || suffixName == 'xls' || suffixName == 'xlsx') {
if (suffixName == 'pdf') {
pageMarker2 = pageMarker + '-pdf'
- that.pdfName =fileName;
+ that.pdfName = fileName;
} else if (suffixName == 'doc' || suffixName == 'docx') {
pageMarker2 = pageMarker + '-doc'
- that.docName =fileName;
+ that.docName = fileName;
} else if (suffixName == 'jpg' || suffixName == 'jpeg' || suffixName == 'png') {
pageMarker2 = pageMarker + '-img'
- that.imgName =fileName;
+ that.imgName = fileName;
} else if (suffixName == 'xls' || suffixName == 'xlsx') {
pageMarker2 = pageMarker + '-xls'
- that.xlsName =fileName;
+ that.xlsName = fileName;
}
return openPreviewDialog(fileId, suffixName, document.getElementById(pageMarker2), pageMarker2);
} else {
@@ -182,4 +185,4 @@
}
}
-export {setAccessoryFormatComm, setAccessoryFormat2, setAccessoryFormat3}
+export {setAccessoryFormatComm, setAccessoryFormatSingle, setAccessoryFormatByForm}
--
Gitblit v1.9.1