Browse Source

Merge remote-tracking branch 'origin/master'

master
lxc 2 years ago
parent
commit
5814a7ca9e
  1. 11
      lpro/src/main/webapp/WEB-INF/oss/base/lpm.jsp
  2. 2
      lpro/src/main/webapp/lib/echarts/echarts-liquidfill.min.js
  3. 1
      lpro/src/main/webapp/lib/echarts/echarts-liquidfill.min.js.map
  4. 23
      lpro/src/main/webapp/lib/echarts/echarts.min.js
  5. 22
      lpro/src/main/webapp/lib/lpro/ljc_0.2.js

11
lpro/src/main/webapp/WEB-INF/oss/base/lpm.jsp

@ -61,11 +61,11 @@
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">IP:</span> <span class="span-name">IP:</span>
<input validate="empty" type-name="ip" style="width: 340px;" placeholder="请输入ip" class="input input-auto" /> <input validate="ip:请输入正确的地址,示例:[0-255.0-255.0-255.0-255]" type-name="ip" style="width: 340px;" placeholder="请输入ip" class="input input-auto" />
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">PORT:</span> <span class="span-name">PORT:</span>
<input type-name="port" validate="empty" style="width: 340px;" placeholder="请输入端口" class="input input-auto" /> <input validate="port:请输入正确的端口,端口号[0-65535]" type-name="port" style="width: 340px;" placeholder="请输入端口" class="input input-auto" />
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">LPM-KEY:</span> <span class="span-name">LPM-KEY:</span>
@ -90,11 +90,11 @@
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">IP:</span> <span class="span-name">IP:</span>
<input validate="empty" type-name="ip" style="width: 340px;" placeholder="请输入ip" class="input input-auto" /> <input validate="ip:请输入正确的地址,示例:[0-255.0-255.0-255.0-255]" type-name="ip" style="width: 340px;" placeholder="请输入ip" class="input input-auto" />
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">PORT:</span> <span class="span-name">PORT:</span>
<input type-name="port" validate="empty" style="width: 340px;" placeholder="请输入端口" class="input input-auto" /> <input validate="port:请输入正确的端口,端口号[0-65535]" type-name="port" style="width: 340px;" placeholder="请输入端口" class="input input-auto" />
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<span class="span-name">LPM-KEY:</span> <span class="span-name">LPM-KEY:</span>
@ -142,5 +142,8 @@ function t_delete(obj,id){
}); });
} }
function ip_Blur(){
}
</script> </script>
</html> </html>

2
lpro/src/main/webapp/lib/echarts/echarts-liquidfill.min.js

File diff suppressed because one or more lines are too long

1
lpro/src/main/webapp/lib/echarts/echarts-liquidfill.min.js.map

File diff suppressed because one or more lines are too long

23
lpro/src/main/webapp/lib/echarts/echarts.min.js

File diff suppressed because one or more lines are too long

22
lpro/src/main/webapp/lib/lpro/ljc_0.2.js

@ -533,6 +533,18 @@ var validater ={
return true; return true;
} }
return false; return false;
},ip:function (obj){
var pattern= /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
if (pattern.test(obj)) {
return true;
}
return false;
},port:function (obj){
var pattern= /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/;
if (pattern.test(obj)) {
return true;
}
return false;
} }
} }
@ -646,6 +658,16 @@ var validate = {
return getVal(validate_tip, "请输入正确的身份证号码"); return getVal(validate_tip, "请输入正确的身份证号码");
} }
} }
if(validate_type == 'ip'){
if(!validater.ip(selectorVal(thisObj))){
return getVal(validate_tip,"请输入正确的地址,示例:[0-255.0-255.0-255.0-255]");
}
}
if(validate_type == 'port'){
if(!validater.port(selectorVal(thisObj))){
return getVal(validate_tip,"请输入正确的端口,端口号[0-65535]");
}
}
} }
return "" ; return "" ;
}, },

Loading…
Cancel
Save