github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !338 from 谁是大胖子/master

pull/338/MERGE
谁是大胖子 2022-12-16 00:54:51 +00:00 committed by Gitee
parent 9d02f8f7e7 7b2772c28f
commit 295421ce2d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
View File

@ -1,8 +1,16 @@
/*this is basic form validation using for validation person's basic information author:Clara Guo data:2017/07/20*/ /*this is basic form validation using for validation person's basic information author:Clara Guo data:2017/07/20*/
$(document).ready(function(){ $(document).ready(function(){
$.validator.setDefaults({ $.validator.setDefaults({
submitHandler: function(form) { focusInvalid:true,
form.submit(); onfocusout: false,
invalidHandler: function(form, validator) {
var errors = validator.numberOfInvalids();
if (errors) {
validator.errorList[0].element.focus();
}
},
submitHandler: function(form) {
form.submit();
} }
}); });
//手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$) //手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$)

11
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -436,7 +436,16 @@ var sub = {
var textareaValue = $(columns[i]).find('textarea'); var textareaValue = $(columns[i]).find('textarea');
var key = dataColumns[i].field; var key = dataColumns[i].field;
if ($.common.isNotEmpty(inputValue.val())) { if ($.common.isNotEmpty(inputValue.val())) {
obj[key] = inputValue.val(); var inputType = inputValue.attr("type");
if(inputType === 'checkbox'){
if(inputValue.is(':checked')) {
obj[key] = inputValue.val();
}else{
obj[key] = '';
}
}else{
obj[key] = inputValue.val();
}
} else if ($.common.isNotEmpty(selectValue.val())) { } else if ($.common.isNotEmpty(selectValue.val())) {
obj[key] = selectValue.val(); obj[key] = selectValue.val();
} else if ($.common.isNotEmpty(textareaValue.val())) { } else if ($.common.isNotEmpty(textareaValue.val())) {