Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
a0a12636
Commit
a0a12636
authored
Apr 21, 2019
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化了一些小问题
parent
a2ca643a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
9 deletions
+15
-9
ruoyi-admin/src/main/resources/application.yml
+2
-2
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
+6
-6
ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
+1
-1
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+6
-0
No files found.
ruoyi-admin/src/main/resources/application.yml
View file @
a0a12636
...
...
@@ -13,10 +13,10 @@ ruoyi:
# 开发环境配置
server
:
# 服务
端口
# 服务
器的HTTP端口,默认为80
port
:
80
servlet
:
#
项目contextPath
#
应用的访问路径
context-path
:
/
tomcat
:
# tomcat的URI编码
...
...
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
View file @
a0a12636
...
...
@@ -60,9 +60,9 @@
}
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
(),
$lths
=
$ltr
.
clone
().
find
(
'th'
),
$lths
=
$ltr
.
clone
(
true
).
find
(
'th'
),
$rths
=
$rtr
.
clone
().
find
(
'th'
);
$ltr
.
html
(
''
);
...
...
@@ -78,7 +78,7 @@
//左边列冻结
if
(
this
.
options
.
fixedColumns
)
{
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
);
}
...
...
@@ -95,12 +95,12 @@
if
(
this
.
options
.
fixedColumns
)
{
this
.
$fixedBodyColumns
.
html
(
''
);
this
.
$body
.
find
(
'> tr[data-index]'
).
each
(
function
()
{
var
$tr
=
$
(
this
).
clone
(),
$tds
=
$tr
.
clone
().
find
(
'td'
);
var
$tr
=
$
(
this
).
clone
(
true
),
$tds
=
$tr
.
clone
(
true
).
find
(
'td'
);
$tr
.
html
(
''
);
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
);
});
...
...
ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
View file @
a0a12636
...
...
@@ -8,7 +8,7 @@ $(document).ready(function(){
//手机号码验证身份证正则合并:(^\d{15}$)|(^\d{17}([0-9]|X)$)
jQuery
.
validator
.
addMethod
(
"isPhone"
,
function
(
value
,
element
){
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
));
},
"请填写正确的11位手机号"
);
//电话号码验证
...
...
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View file @
a0a12636
...
...
@@ -9,6 +9,12 @@ import java.util.Date;
#
break
#
end
#
end
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
attrType
==
'BigDecimal'
)
import
java
.
math
.
BigDecimal
;
#
break
#
end
#
end
/**
*
${
tableComment
}
表
${
tableName
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment