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

优化了一些小问题

pull/85/head
RuoYi 2019-04-21 12:05:44 +08:00
parent a2ca643a3a
commit a0a12636ef
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application.yml
View File

@ -13,10 +13,10 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务端口 # 服务器的HTTP端口，默认为80
port: 80 port: 80
servlet: servlet:
# 项目contextPath # 应用的访问路径
context-path: / context-path: /
tomcat: tomcat:
# tomcat的URI编码 # tomcat的URI编码

12
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
View File

@ -60,9 +60,9 @@
} }
this.initFixedColumns(); this.initFixedColumns();
var $ltr = this.$header.find('tr:eq(0)').clone(), var $ltr = this.$header.find('tr:eq(0)').clone(true),
$rtr = this.$header.find('tr:eq(0)').clone(), $rtr = this.$header.find('tr:eq(0)').clone(),
$lths = $ltr.clone().find('th'), $lths = $ltr.clone(true).find('th'),
$rths = $rtr.clone().find('th'); $rths = $rtr.clone().find('th');
$ltr.html(''); $ltr.html('');
@ -78,7 +78,7 @@
//左边列冻结 //左边列冻结
if (this.options.fixedColumns) { if (this.options.fixedColumns) {
for (var i = 0; i < this.options.fixedNumber; i++) { for (var i = 0; i < this.options.fixedNumber; i++) {
$ltr.append($lths.eq(i).clone()); $ltr.append($lths.eq(i).clone(true));
} }
this.$fixedHeaderColumns.html('').append($ltr); this.$fixedHeaderColumns.html('').append($ltr);
} }
@ -95,12 +95,12 @@
if (this.options.fixedColumns) { if (this.options.fixedColumns) {
this.$fixedBodyColumns.html(''); this.$fixedBodyColumns.html('');
this.$body.find('> tr[data-index]').each(function () { this.$body.find('> tr[data-index]').each(function () {
var $tr = $(this).clone(), var $tr = $(this).clone(true),
$tds = $tr.clone().find('td'); $tds = $tr.clone(true).find('td');
$tr.html(''); $tr.html('');
for (var i = 0; i < that.options.fixedNumber; i++) { for (var i = 0; i < that.options.fixedNumber; i++) {
$tr.append($tds.eq(i).clone()); $tr.append($tds.eq(i).clone(true));
} }
that.$fixedBodyColumns.append($tr); that.$fixedBodyColumns.append($tr);
}); });

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

@ -8,7 +8,7 @@ $(document).ready(function(){
//手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$) //手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$)
jQuery.validator.addMethod("isPhone",function(value,element){ jQuery.validator.addMethod("isPhone",function(value,element){
var length = value.length; var length = value.length;
var phone=/^1[3|4|5|6|7|8][0-9]\d{8}$/; var phone=/^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
return this.optional(element)||(length == 11 && phone.test(value)); return this.optional(element)||(length == 11 && phone.test(value));
},"请填写正确的11位手机号"); },"请填写正确的11位手机号");
//电话号码验证 //电话号码验证

6
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@ -9,6 +9,12 @@ import java.util.Date;
#break #break
#end #end
#end #end
#foreach ($column in $columns)
#if($column.attrType == 'BigDecimal')
import java.math.BigDecimal;
#break
#end
#end
/** /**
* ${tableComment}表 ${tableName} * ${tableComment}表 ${tableName}