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
d10e72c0
"eladmin-system/src/main/vscode:/vscode.git/clone" did not exist on "784d670c54da9fdc838646383e02498d0299534c"
Commit
d10e72c0
authored
Mar 16, 2018
by
李家智
Browse files
日期类型多种支持
parent
ec708bba
Changes
4
Hide whitespace changes
Inline
Side-by-side
admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java
View file @
d10e72c0
...
...
@@ -118,6 +118,15 @@ public class BeetlConf {
});
groupTemplate
.
registerFunction
(
"abcd"
,
new
Function
()
{
@Override
public
Boolean
call
(
Object
[]
paras
,
Context
ctx
)
{
return
true
;
}
});
groupTemplate
.
registerFunction
(
"env"
,
new
Function
()
{
@Override
...
...
admin-core/src/main/java/com/ibeetl/admin/core/conf/JasonConfig.java
View file @
d10e72c0
...
...
@@ -4,6 +4,7 @@ import java.io.IOException;
import
java.text.SimpleDateFormat
;
import
org.beetl.sql.core.engine.PageQuery
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -19,6 +20,7 @@ import com.ibeetl.admin.core.web.JsonResult;
@Configuration
public
class
JasonConfig
{
@Bean
@ConditionalOnMissingBean
(
ObjectMapper
.
class
)
public
ObjectMapper
getObjectMapper
()
{
ObjectMapper
objectMapper
=
new
ObjectMapper
();
objectMapper
.
setDateFormat
(
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
));
...
...
@@ -34,7 +36,7 @@ public class JasonConfig {
* @author xiandafu
*
*/
static
class
CustomJsonResultSerializer
extends
JsonSerializer
<
JsonResult
>
{
public
static
class
CustomJsonResultSerializer
extends
JsonSerializer
<
JsonResult
>
{
public
CustomJsonResultSerializer
()
{
}
...
...
admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java
View file @
d10e72c0
...
...
@@ -92,6 +92,7 @@ public class MVCConf implements WebMvcConfigurer, InitializingBean {
@Override
public
void
addFormatters
(
FormatterRegistry
registry
)
{
registry
.
addFormatter
(
new
DateFormatter
(
"yyyy-MM-dd HH:mm:ss"
));
registry
.
addFormatter
(
new
DateFormatter
(
"yyyy-MM-dd"
));
}
...
...
admin-core/src/main/resources/static/js/lib.js
View file @
d10e72c0
...
...
@@ -185,6 +185,14 @@ var Lib = {
range
:
'
至
'
});
})
$
(
form
).
find
(
"
.input-date
"
).
each
(
function
()
{
laydate
=
layui
.
laydate
;
laydate
.
render
({
elem
:
$
(
this
)[
0
],
});
})
},
_dropdown
:
function
(
layuiForm
,
data
,
form
,
select
,
groupName
)
{
...
...
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