From 829bfe3e8376f20f90a4b2361c9a8c3ed0e80d45 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 17:21:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/util/func.js | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/util/func.js b/Source/UBCS-WEB/src/util/func.js
index 78bd256..9d6d017 100644
--- a/Source/UBCS-WEB/src/util/func.js
+++ b/Source/UBCS-WEB/src/util/func.js
@@ -75,8 +75,8 @@
/**
* ts鏃ユ湡鏍煎紡澶勭悊
- * @param {瑕佸鐞嗙殑鏃ユ湡} thisDate
- * @returns
+ * @param {瑕佸鐞嗙殑鏃ユ湡} thisDate
+ * @returns
*/
static formattedDateTime(thisDate) {
const date = new Date(thisDate);
@@ -133,20 +133,22 @@
* @returns {Boolean}
*/
static downloadFileByBlobHandler(res) {
- const fileNames = res.headers['content-disposition'].split(";");
- let characterSet = fileNames[2].split("filename*=")[1];
- let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); // 涓嬭浇鐨勬枃浠跺悕
- let blob = new Blob([res.data], {
- type: res.data.type + ";charset=utf-8",
- });
- const url = URL.createObjectURL(blob); // 鐢熸垚涓嬭浇閾炬帴
- const link = document.createElement("a");
- link.href = url;
- link.download = fileName; // 鎸囧畾鏂囦欢鍚嶅拰鏍煎紡
- document.body.appendChild(link); // 娣诲姞涓嬭浇閾炬帴鍒伴〉闈�
- link.click(); // 瑙﹀彂涓嬭浇
- document.body.removeChild(link); //鍒犻櫎涓嬭浇
- window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
+ if(res.headers['content-disposition']){
+ const fileNames = res.headers['content-disposition'].split(";");
+ let characterSet = fileNames[2].split("filename*=")[1];
+ let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); // 涓嬭浇鐨勬枃浠跺悕
+ let blob = new Blob([res.data], {
+ type: res.data.type + ";charset=utf-8",
+ });
+ const url = URL.createObjectURL(blob); // 鐢熸垚涓嬭浇閾炬帴
+ const link = document.createElement("a");
+ link.href = url;
+ link.download = fileName; // 鎸囧畾鏂囦欢鍚嶅拰鏍煎紡
+ document.body.appendChild(link); // 娣诲姞涓嬭浇閾炬帴鍒伴〉闈�
+ link.click(); // 瑙﹀彂涓嬭浇
+ document.body.removeChild(link); //鍒犻櫎涓嬭浇
+ window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
+ }
}
/**
@@ -166,9 +168,9 @@
/**
* 灏嗘暟缁勪腑鐨勫睘鎬ф嫾鎺ユ垚瀛楃涓�
- * @param {鏁扮粍} array
- * @param {灞炴� attr
- * @returns
+ * @param {鏁扮粍} array
+ * @param {灞炴� attr
+ * @returns
*/
static joinedString(array,attr) {
return array.reduce((accumulator, item) => {
@@ -178,8 +180,8 @@
/**
* 姣斿鏁扮粍涓殑瀵硅薄鐨勬煇涓睘鎬ф槸鍚﹀叏閮ㄤ竴鑷�
- * @param {鏁扮粍} array
- * @param {灞炴� attr
+ * @param {鏁扮粍} array
+ * @param {灞炴� attr
* @returns 涓�鑷磋繑鍥瀎asle,涓嶄竴鑷磋繑鍥瀟rue
*/
static isAttrInconsistent(array,attr) {
--
Gitblit v1.9.3