qiushang 11 ماه پیش
والد
کامیت
48f9b6ed9e
3فایلهای تغییر یافته به همراه15 افزوده شده و 8 حذف شده
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 11 4
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.2.9"
+!define PRODUCT_VERSION        		"2.0.3.0"
 !define PRODUCT_NAME           		"星优图片下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.9.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.3.0.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.9"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.3.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.0.2.9",
+	"version": "2.0.3.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

+ 11 - 4
src/renderer/components/home.vue

@@ -495,6 +495,11 @@
 							let errMsg = "";
 							workSheetsFromBuffer[0].data.map((item, index) => {
 								if(item.length > 0){
+									let ititle = item[0].toString().trim();
+									if(this.containsAnyChar(ititle.toString(), ['\\', '/', ':', '*', '?', '"', '<', '>', '|'])){  //判断是否含有特殊字符
+										errMsg += "第" + (index+1) + '行-名称不能包以下字符 \\ / : * ? " < > |';
+										ititle = ititle.replace(/[\\|/|:|*|?|"|<|>||]/g, "");
+									}
 									if(item[1] == undefined){
 										errMsg += "第" + (index+1) + "行格式有误</br>";
 										item[1] = '';
@@ -503,7 +508,7 @@
 									}else{
 										let info = {
 											url: item[1],
-											title: item[0].toString().trim(),
+											title: ititle,
 											status: '1',
 											num: 0,
 											newPath: ''
@@ -693,7 +698,7 @@
 							
 							page.on('response', async(response) => {
 								// 检查响应的 MIME 类型是否以 'image/' 开头
-								if (response.headers()['content-type'] && response.headers()['content-type'].startsWith('image/')) {  
+								if (response.headers()['content-type'] && response.headers()['content-type'].startsWith('image/') && response.headers()['content-length']) {
 									let imgArr = ['gif', 'jpeg', 'png', 'webp', 'svg', 'tiff', 'bmp', 'ico', 'avif'];
 									let imgType = 'jpg';
 									let isBase = false;
@@ -1636,12 +1641,14 @@
 							if (status < 200 || status >= 300) {
 								reject(false);
 								this.$notify.error({
-									title: '网络异常,请稍后重试!- 1 - ' + imageUrl
+									title: '网络图片访问异常!- 1',
+									message: imageUrl.slice(0,50)
 								});
 							}else if(isNaN(total_bytes)){
 								reject(false);
 								this.$notify.error({
-									title: '网络异常,请稍后重试!- 2 - ' + imageUrl
+									title: '网络图片访问异常!- 2',
+									message: imageUrl.slice(0,50)
 								});
 							}else{
 								// console.log('下载中...')