diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index 7c707f2ab..5d9818298 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -5243,8 +5243,11 @@ Form Layouts
.portlet-form .form-section,
.form .form-section {
margin: 12px 0px 14px 0px;
- padding-bottom: 5px;
- border-bottom: 1px solid #e7ecf1; }
+padding: 5px;
+border: solid #e7ecf1;
+border-width: 1px 1px 0 1px;
+width: 100%;
+background: #e7ecf1; }
.form-fit .portlet-form .form-section, .form-fit
.form .form-section {
margin-left: 20px;
@@ -5843,7 +5846,7 @@ Custom color buttons
/* Form uneditable input */
.uneditable-input {
padding: 6px 12px;
- min-width: 206px;
+ width: 206px;
font-size: 14px;
font-weight: normal;
height: 34px;
@@ -5853,6 +5856,14 @@ Custom color buttons
-webkit-box-shadow: none;
box-shadow: none;
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ -icab-text-overflow: ellipsis;
+ -khtml-text-overflow: ellipsis;
+ -moz-text-overflow: ellipsis;
+ -webkit-text-overflow: ellipsis;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; }
.form-control-static {
@@ -22279,7 +22290,7 @@ Color library demo
-/*锟斤拷锟斤拷锟斤拷式*/
+/*閿熸枻鎷烽敓鏂ゆ嫹閿熸枻鎷峰紡*/
.sort-column {
@@ -22551,7 +22562,7 @@ transition: background-color .1s ease-in-out;
/* END SHOW MORE CSS**/
-/**鐎涙劙鍘ょ純顕�锟藉銆嶉崡鈩冪壉瀵拷**/
+/**閻庢稒鍔欓崢銈囩磾椤曪拷閿熻棄顦甸妴宥夊础閳╁啰澹夌�顕嗘嫹**/
.tabInfo {
border: 1px solid #c2cad8;
padding: 5px;
@@ -22592,4 +22603,19 @@ span[id^='close']{
background:url(../img/loading.gif) no-repeat center center;
opacity:0.7;
filter:progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+}
+.border-top {
+ border-top: 1px solid;
+ padding-top:5px;
+}
+.border-top + .form-section{
+ margin-top:-25px;
+ width: 100%;
+ background: #e7ecf1;
+ border:none
+}
+.form-section + .boxSolid {
+ border: 1px solid #eeeeee;
+ margin-top:-14px;
+ margin-bottom:10px
}
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
index 1ee44dda8..2c36da4fa 100644
--- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
+++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
@@ -176,7 +176,8 @@ optgroup {
table {
border-collapse: collapse;
- border-spacing: 0; }
+ border-spacing: 0;
+ }
td,
th {
@@ -1542,7 +1543,7 @@ pre {
clear: both; }
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
- position: relative;
+ position: relative;
min-height: 1px;
/* padding-left: 15px;
padding-right: 15px; */
@@ -2038,7 +2039,7 @@ th {
width: 100%;
max-width: 100%;
margin-bottom: 10px;
- margin-top: 10px;
+ margin-top: -1px;
}
.table > thead > tr > th,
.table > thead > tr > td,
@@ -2230,6 +2231,7 @@ table th[class*="col-"] {
position: fixed;
right: 14px;
left: 14px;
+ margin-top: 20px;
}
@media screen and (max-width: 767px) {
.table-responsive {
@@ -5172,7 +5174,8 @@ button.close {
.modal-body {
position: relative;
- padding: 15px; }
+ /* padding: 15px; */
+ }
.modal-footer {
padding: 15px;
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index f2dea5e79..9c2a95215 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -9,16 +9,16 @@ $(function(){
protocol:[],
direction:[]
});
+ $("input[name$='isCaseSenstive']").on("change",function(){
+ setIsHexBin(this);
+ });
+ setHexCaseSenstive();
$("select[name$='isHexbin']").each(function(){
setIsHexBin(this);
});
$("input[name$='isHex']").on("change",function(){
setIsHexBin(this);
});
- $("input[name$='isCaseSenstive']").on("change",function(){
- setIsHexBin(this);
- });
- setHexCaseSenstive();
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "";
$(this).parents("tr").find("td").each(function(index,element){
@@ -360,6 +360,7 @@ $(function(){
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
+ switchAction($(this).val());
});
// 校验搜索条件里的时间选框，不允许起始时间晚于终止时间
$("#searchForm").validate({
@@ -535,6 +536,21 @@ $(function(){
$(this).val(0);
}
});
+ //配置修改时已经展开的域上的加号隐藏
+ $(".boxSolid:visible").each(function(){
+ $(this).prev("h4").find(".glyphicon-plus").addClass("hidden");
+ });
+ //IP域修改时默认展开,不显示show more
+ if($("input[name='compileId']")&&$("input[name='compileId']").val()!=0&&($(".btn-red-hollow").parents(".boxSolid").is(":visible")||$("input[name$='cfgRegionCode']").length==1)){
+ $(".port").removeClass("hidden").removeClass("disabled");
+ $(".destPort").removeClass("hidden").removeClass("disabled");
+ $(".protocol").removeClass("hidden").removeClass("disabled");
+ $(".btn-red-hollow").addClass("hidden");
+ }
+
+ $("#messageBox .close").on("click",function(){
+ heightDiv(1);
+ })
});
window.onload=function(){
$("span[id^=open]").click(function(){
@@ -584,6 +600,21 @@ window.onload=function(){
heightDiv();
},500);
+ if($('.table-responsive')){
+ var tableCont = document.querySelector('.table-responsive');
+ if(tableCont !=null && tableCont!=''){
+ function scrollHandle (e){
+ var scrollTop = this.scrollTop;
+ $('th').css('transform','translateY(' + scrollTop + 'px)');
+ $('thead tr').css('z-index','2147482468');
+ $('thead tr').css('position','relative');
+ $('th').css('border','1px solid rgb(255, 255, 255)');
+ $('th').css('background-clip','padding-box');
+ }
+ tableCont.addEventListener('scroll',scrollHandle);
+ $('#contentTable').attr("margin-top",'0px');
+ }
+ }
}
var setInterceptDefaultInfo=function(cfgId){
var action=$("input[name='action']:checked").val();
@@ -1823,14 +1854,23 @@ var initCommIpVal=function(){
}
}
-function heightDiv(){
+
+function heightDiv(type){
var hei=document.documentElement.clientHeight;
- hei=hei-71;
+ hei=hei-91;
var rowheigth=0;
if($('.row')){
rowheigth=$('.row').height();
hei=hei-rowheigth;
}
+ if(type != 1){
+ if($("#messageBox")){
+ var messageH=$("#messageBox").height();
+ if(messageH > 0){
+ hei=hei-messageH-52;
+ }
+ }
+ }
if($('.table-responsive')){
$('.table-responsive').css({'height':hei+'px'});
}