From 3240ad4de2d1a2ccdb2655e4ec661d1e3d3d7d48 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 12 Nov 2018 14:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E5=8E=BB?= =?UTF-8?q?=E6=8E=89xls=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BB=85=E4=BF=9D?= =?UTF-8?q?=E7=95=99xlsx=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 2 +- src/main/webapp/static/pages/scripts/importExcel.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f49c4b3da..402363e2f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1282,7 +1282,7 @@ single_keyword_tip=Only single key input is allowed. ipv4_mask_range_tip=IP mask must between 16 and 32 ipv6_mask_range_tip=IP Mask must between 2 and 128 letter_cancel_info=Cancel Letter Info -import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import. +import_tip_excel=Please choose a valid Excel file with which it's subfix is .xlsx to import. http_keyword=Website Keyword http_keyword_monit=Website Keyword Monit http_keyword_reject=Website Keyword Block diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index d985f4ffc..bd316e849 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1287,7 +1287,7 @@ single_keyword_tip=Only single key input is allowed. ipv4_mask_range_tip=IP mask must between 16 and 32 ipv6_mask_range_tip=IP Mask must between 2 and 128 letter_cancel_info=Cancel Letter Info -import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import. +import_tip_excel=Please choose a valid Excel file with which it's subfix is .xlsx to import. http_keyword=Website Keyword http_keyword_monit=Website Keyword Monit http_keyword_reject=Website Keyword Reject diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 9f6f04d16..be001836a 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1274,7 +1274,7 @@ single_keyword_tip=Only single key input is allowed. ipv4_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e16\u548c32\u4e4b\u95f4 ipv6_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e2\u548c128\u4e4b\u95f4 letter_cancel_info=\u53d6\u6d88\u5ba1\u6838\u6765\u51fd -import_tip_excel=\u8bf7\u9009\u62e9\u6587\u4ef6\u7ed3\u5c3e\u4e3a.xls\u6216\u8005.xlsx\u7684\u6709\u6548Excel\u6587\u4ef6\u5bfc\u5165 +import_tip_excel=\u8bf7\u9009\u62e9\u6587\u4ef6\u7ed3\u5c3e\u4e3a.xlsx\u7684\u6709\u6548Excel\u6587\u4ef6\u5bfc\u5165 http_keyword=\u7f51\u9875\u5173\u952e\u5b57 http_keyword_monit=\u7f51\u9875\u5173\u952e\u5b57\u76d1\u6d4b http_keyword_reject=\u7f51\u9875\u5173\u952e\u5b57\u963b\u65ad diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js index 40718e18c..0bd9c540c 100644 --- a/src/main/webapp/static/pages/scripts/importExcel.js +++ b/src/main/webapp/static/pages/scripts/importExcel.js @@ -135,7 +135,7 @@ var importCfg=function(){ $error.addClass("show"); return false; - }else if(fileName.lastIndexOf("\.")==-1||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xls' &&fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xlsx'){ + }else if(fileName.lastIndexOf("\.")==-1/*||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xls'*/ ||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xlsx'){ $("span",$error).html($("#importTip").val()); $error.removeClass("hide"); $error.addClass("show");