Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Springboot Plus
Commits
46227d5b
Commit
46227d5b
authored
May 06, 2018
by
jmu
Browse files
add datetime feature
(cherry picked from commit dc40a5d)
parent
bc488f20
Changes
2
Hide whitespace changes
Inline
Side-by-side
admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java
View file @
46227d5b
...
...
@@ -26,7 +26,7 @@ public class Tool {
public
static
Date
[]
parseDataTimeRange
(
String
str
)
{
//查询范围
String
[]
arrays
=
str
.
split
(
"
To
"
);
String
[]
arrays
=
str
.
split
(
"
至
"
);
Date
min
=
parseDateWithPattern
(
arrays
[
0
],
DATETIME_FORAMT
);
Date
max
=
parseDateWithPattern
(
arrays
[
1
],
DATETIME_FORAMT
);
...
...
admin-core/src/main/resources/static/js/lib.js
View file @
46227d5b
...
...
@@ -182,7 +182,7 @@ var Lib = {
laydate
=
layui
.
laydate
;
laydate
.
render
({
elem
:
$
(
this
)[
0
],
range
:
'
To
'
range
:
'
至
'
});
});
...
...
@@ -190,7 +190,7 @@ var Lib = {
laydate
=
layui
.
laydate
;
laydate
.
render
({
elem
:
$
(
this
)[
0
],
range
:
'
To
'
,
range
:
'
至
'
,
type
:
'
datetime
'
});
});
...
...
Write
Preview
Supports
Markdown
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