diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index dd1591d76..674a658b3 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1466,4 +1466,5 @@ service_statistics=Service Statistics website_statistics=Website Statistics not_exist=not exist real_time=Real Time -history=History \ No newline at end of file +history=History +all_columns_hidden=All columns are hidden! \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 2bdf47cfc..c4da5c31f 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1470,4 +1470,5 @@ service_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 website_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0412\u0435\u0431-\u0441\u0430\u0439\u0442\u043e\u0432 not_exist=not exist real_time=Real Time -history=History \ No newline at end of file +history=History +all_columns_hidden=All columns are hidden! \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 1f6a3983e..dcfadd401 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1466,4 +1466,5 @@ service_statistics=\u670d\u52a1\u7edf\u8ba1 website_statistics=\u7f51\u7ad9\u7edf\u8ba1 not_exist=\u4e0d\u5b58\u5728 real_time=\u5b9e\u65f6 -history=\u5386\u53f2 \ No newline at end of file +history=\u5386\u53f2 +all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index ddf6ffd12..4338e2c3c 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -415,10 +415,13 @@ function cancelPassOpt(url){ url+="&"+$("#exportType").val()+"="+$("#exportValue").val(); } } - if(column){ + if(column.toString()!=""){ url+="&columns="+column.toString(); + }else{ + top.$.jBox.tip("", ""); + return; } - if(hColumn){ + if(hColumn.toString()!=""){ url+="&hColumns="+hColumn.toString(); } var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");