Procházet zdrojové kódy

项目附件上传后缀名大小写不敏感更改

user5 před 4 roky
rodič
revize
4975295f72

+ 20 - 16
src/main/webapp/static/oss/ossupload.js

@@ -134,6 +134,7 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                         "divIdType":divId
                     },
                     success:function(data){
+                        var lowerType = data.type.toLowerCase();
                         console.log('url : ' + data.url);
                         if(data.status=="Success"){
                             parent.layer.msg("上传成功!",{icon:1});
@@ -152,9 +153,9 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                                     data:{"file":data.url,},
                                     success:function(result){
                                         lookUrl = result.lookUrl;
-                                        if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                             str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                        }else if(isContains("pdf",data.type)){
+                                        }else if(isContains("pdf",data.lowerType)){
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                         }else {
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -163,9 +164,9 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                                 });
 
                             }else{
-                                if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                     str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                }else if(isContains("pdf",data.type)){
+                                }else if(isContains("pdf",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -240,6 +241,7 @@ function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,d
                         "divIdType":divId
                     },
                     success:function(data){
+                        var lowerType = data.type.toLowerCase();
                         console.log('url : ' + data.url);
                         if(data.status=="Success"){
                             parent.layer.msg("上传成功!",{icon:1});
@@ -253,9 +255,9 @@ function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,d
                                     data:{"file":data.url,},
                                     success:function(result){
                                         lookUrl = result.lookUrl;
-                                        if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                             str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                        }else if(isContains("pdf",data.type)){
+                                        }else if(isContains("pdf",lowerType)){
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                         }else {
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -264,9 +266,9 @@ function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,d
                                 });
 
                             }else{
-                                if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                     str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                }else if(isContains("pdf",data.type)){
+                                }else if(isContains("pdf",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -329,6 +331,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                         "divIdType":divId
                     },
                     success:function(data){
+                        var lowerType = data.type.toLowerCase();
                         console.log('url : ' + data.url);
                         if(data.status=="Success"){
                             parent.layer.msg("上传成功!",{icon:1});
@@ -342,9 +345,9 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                                     data:{"file":data.url,},
                                     success:function(result){
                                         lookUrl = result.lookUrl;
-                                        if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                             str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                        }else if(isContains("pdf",data.type)){
+                                        }else if(isContains("pdf",lowerType)){
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                         }else {
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -353,9 +356,9 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                                 });
 
                             }else{
-                                if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                     str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                }else if(isContains("pdf",data.type)){
+                                }else if(isContains("pdf",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -431,6 +434,7 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                         "divIdType":divId
                     },
                     success:function(data){
+                        var lowerType = data.type.toLowerCase();
                         // console.log('ajax requst : ' + data.status);
                         console.log('url : ' + data.url);
                         if(data.status=="Success"){
@@ -450,9 +454,9 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                                     data:{"file":data.url,},
                                     success:function(result){
                                         lookUrl = result.lookUrl;
-                                        if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                             str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                        }else if(isContains("pdf",data.type)){
+                                        }else if(isContains("pdf",lowerType)){
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                         }else {
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
@@ -461,9 +465,9 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                                 });
 
                             }else{
-                                if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
                                     str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
-                                }else if(isContains("pdf",data.type)){
+                                }else if(isContains("pdf",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';

+ 2 - 0
src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -46,6 +46,8 @@
 			var fileNameLength = tValue.length;//获取到文件名长度
 
 			var suffix = tValue.substring(fileName + 1, fileNameLength);//截取后缀名
+			suffix = suffix.toLowerCase();//后缀名转换小写
+			attachTypes = attachTypes.toLowerCase();
 			if(attachTypes!=undefined && attachTypes !=null & attachTypes !=''){
 				var attachTypeList = attachTypes.split(",");
 				for (var x in attachTypeList) {

+ 4 - 2
src/main/webapp/webpage/modules/projectFilingBatch/ProjectFilingBatchProInfoForm.jsp

@@ -61,6 +61,8 @@
 			var fileNameLength = tValue.length;//获取到文件名长度
 
 			var suffix = tValue.substring(fileName + 1, fileNameLength);//截取后缀名
+			suffix = suffix.toLowerCase();//后缀名转换小写
+			attachTypes = attachTypes.toLowerCase();
 			if(attachTypes!=undefined && attachTypes !=null & attachTypes !=''){
 				var attachTypeList = attachTypes.split(",");
 				for (var x in attachTypeList) {
@@ -83,7 +85,7 @@
 				var file = files[i];
 				var fileSize = (file.size/(1024 * 1024)).toFixed(2);
 				if(attachLength !=undefined && attachLength != null && attachLength !='') {
-					if (fileSize > attachLength) {
+					if (parseFloat(fileSize) > parseFloat(attachLength)) {
 						top.layer.msg("上传附件只能上传:" + attachLength + "M以下的文件", {icon: 0});
 						return false;
 					}
@@ -227,4 +229,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>