Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
7a362378
提交
7a362378
authored
1月 20, 2018
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Web Ide国际化定制
上级
482ea3b5
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
12 行增加
和
18 行删除
+12
-18
message.properties
xxl-job-admin/src/main/resources/i18n/message.properties
+2
-0
message_zh.properties
xxl-job-admin/src/main/resources/i18n/message_zh.properties
+0
-7
jobcode.index.ftl
...rc/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
+7
-3
jobcode.index.1.js
xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
+3
-3
layer.js
...dmin/src/main/webapp/static/plugins/layer/mobile/layer.js
+0
-3
layer.css
...rc/main/webapp/static/plugins/layer/mobile/need/layer.css
+0
-2
没有找到文件。
xxl-job-admin/src/main/resources/i18n/message.properties
浏览文件 @
7a362378
...
...
@@ -120,6 +120,8 @@ jobinfo_opt_resume=恢复
jobinfo_opt_log
=
日志
jobinfo_opt_run
=
执行
jobinfo_glue_remark
=
源码备注
jobinfo_glue_remark_limit
=
源码备注长度限制为4~100
jobinfo_glue_rollback
=
版本回溯
## job log
joblog_name
=
调度日志
...
...
xxl-job-admin/src/main/resources/i18n/message_zh.properties
deleted
100644 → 0
浏览文件 @
482ea3b5
admin_name
=
任务调度中心
login_btn
=
登录
login_remember_me
=
记住密码
login_username_placeholder
=
请输入登录账号
login_password_placeholder
=
请输入登录密码
\ No newline at end of file
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
浏览文件 @
7a362378
...
...
@@ -35,7 +35,11 @@
<
#
--
left
nav
--
>
<div
class=
"collapse navbar-collapse pull-left"
id=
"navbar-collapse"
>
<ul
class=
"nav navbar-nav"
>
<li
class=
"active"
><a
href=
"javascript:;"
><
#
list
GlueTypeEnum
as
item
><
#
if
item =
=
jobInfo
.
glueType
>
${item.desc}
</
#
if></
#
list>
任务:${jobInfo.jobDesc}
<span
class=
"sr-only"
>
(current)
</span></a></li>
<li
class=
"active"
><a
href=
"javascript:;"
>
<span
class=
"sr-only"
>
(current)
</span>
【
<
#
list
GlueTypeEnum
as
item
><
#
if
item =
=
jobInfo
.
glueType
>
${item.desc}
</
#
if></
#
list>
】
${jobInfo.jobDesc}
</a></li>
</ul>
</div>
...
...
@@ -43,7 +47,7 @@
<div
class=
"navbar-custom-menu"
>
<ul
class=
"nav navbar-nav"
>
<li
class=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
aria-expanded=
"false"
>
版本回溯
<span
class=
"caret"
></span></a>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
aria-expanded=
"false"
>
${I18n.jobinfo_glue_rollback}
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
role=
"menu"
>
<li
<#
if
jobLogGlues
?
exists
&&
jobLogGlues
?
size
gt
0
>
style="display: none;"
</
#
if>
>
<a
href=
"javascript:;"
class=
"source_version"
version=
"version_now"
glueType=
"${jobInfo.glueType}"
>
...
...
@@ -66,7 +70,7 @@
<li
id=
"save"
>
<a
href=
"javascript:;"
>
<i
class=
"fa fa-fw fa-save"
></i>
保存
${I18n.system_save}
</a>
</li>
</ul>
...
...
xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
浏览文件 @
7a362378
...
...
@@ -47,7 +47,7 @@ $(function() {
if
(
glueRemark
.
length
<
4
||
glueRemark
.
length
>
100
)
{
layer
.
open
({
title
:
I18n
.
system_tips
,
content
:
'备注长度应该在4至100之间'
,
content
:
I18n
.
jobinfo_glue_remark_limit
,
icon
:
'2'
});
return
;
...
...
@@ -66,7 +66,7 @@ $(function() {
if
(
data
.
code
==
200
)
{
layer
.
open
({
title
:
I18n
.
system_tips
,
content
:
'保存成功'
,
content
:
(
I18n
.
system_save
+
I18n
.
system_success
)
,
icon
:
'1'
,
end
:
function
(
layero
,
index
){
//$(window).unbind('beforeunload');
...
...
@@ -76,7 +76,7 @@ $(function() {
}
else
{
layer
.
open
({
title
:
I18n
.
system_tips
,
content
:
(
data
.
msg
||
"保存失败"
),
content
:
(
data
.
msg
||
(
I18n
.
system_save
+
I18n
.
system_fail
)
),
icon
:
'2'
});
}
...
...
xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/layer.js
deleted
100755 → 0
浏览文件 @
482ea3b5
/*! layer mobile-v2.0.0 Web弹层组件 MIT License http://layer.layui.com/mobile By 贤心 */
;
!
function
(
e
){
"use strict"
;
var
t
=
document
,
n
=
"querySelectorAll"
,
i
=
"getElementsByClassName"
,
a
=
function
(
e
){
return
t
[
n
](
e
)},
s
=
{
type
:
0
,
shade
:
!
0
,
shadeClose
:
!
0
,
fixed
:
!
0
,
anim
:
"scale"
},
l
=
{
extend
:
function
(
e
){
var
t
=
JSON
.
parse
(
JSON
.
stringify
(
s
));
for
(
var
n
in
e
)
t
[
n
]
=
e
[
n
];
return
t
},
timer
:{},
end
:{}};
l
.
touch
=
function
(
e
,
t
){
e
.
addEventListener
(
"click"
,
function
(
e
){
t
.
call
(
this
,
e
)},
!
1
)};
var
r
=
0
,
o
=
[
"layui-m-layer"
],
c
=
function
(
e
){
var
t
=
this
;
t
.
config
=
l
.
extend
(
e
),
t
.
view
()};
c
.
prototype
.
view
=
function
(){
var
e
=
this
,
n
=
e
.
config
,
s
=
t
.
createElement
(
"div"
);
e
.
id
=
s
.
id
=
o
[
0
]
+
r
,
s
.
setAttribute
(
"class"
,
o
[
0
]
+
" "
+
o
[
0
]
+
(
n
.
type
||
0
)),
s
.
setAttribute
(
"index"
,
r
);
var
l
=
function
(){
var
e
=
"object"
==
typeof
n
.
title
;
return
n
.
title
?
'<h3 style="'
+
(
e
?
n
.
title
[
1
]:
""
)
+
'">'
+
(
e
?
n
.
title
[
0
]:
n
.
title
)
+
"</h3>"
:
""
}(),
c
=
function
(){
"string"
==
typeof
n
.
btn
&&
(
n
.
btn
=
[
n
.
btn
]);
var
e
,
t
=
(
n
.
btn
||
[]).
length
;
return
0
!==
t
&&
n
.
btn
?(
e
=
'<span yes type="1">'
+
n
.
btn
[
0
]
+
"</span>"
,
2
===
t
&&
(
e
=
'<span no type="0">'
+
n
.
btn
[
1
]
+
"</span>"
+
e
),
'<div class="layui-m-layerbtn">'
+
e
+
"</div>"
):
""
}();
if
(
n
.
fixed
||
(
n
.
top
=
n
.
hasOwnProperty
(
"top"
)?
n
.
top
:
100
,
n
.
style
=
n
.
style
||
""
,
n
.
style
+=
" top:"
+
(
t
.
body
.
scrollTop
+
n
.
top
)
+
"px"
),
2
===
n
.
type
&&
(
n
.
content
=
'<i></i><i class="layui-m-layerload"></i><i></i><p>'
+
(
n
.
content
||
""
)
+
"</p>"
),
n
.
skin
&&
(
n
.
anim
=
"up"
),
"msg"
===
n
.
skin
&&
(
n
.
shade
=!
1
),
s
.
innerHTML
=
(
n
.
shade
?
"<div "
+
(
"string"
==
typeof
n
.
shade
?
'style="'
+
n
.
shade
+
'"'
:
""
)
+
' class="layui-m-layershade"></div>'
:
""
)
+
'<div class="layui-m-layermain" '
+
(
n
.
fixed
?
""
:
'style="position:static;"'
)
+
'><div class="layui-m-layersection"><div class="layui-m-layerchild '
+
(
n
.
skin
?
"layui-m-layer-"
+
n
.
skin
+
" "
:
""
)
+
(
n
.
className
?
n
.
className
:
""
)
+
" "
+
(
n
.
anim
?
"layui-m-anim-"
+
n
.
anim
:
""
)
+
'" '
+
(
n
.
style
?
'style="'
+
n
.
style
+
'"'
:
""
)
+
">"
+
l
+
'<div class="layui-m-layercont">'
+
n
.
content
+
"</div>"
+
c
+
"</div></div></div>"
,
!
n
.
type
||
2
===
n
.
type
){
var
d
=
t
[
i
](
o
[
0
]
+
n
.
type
),
y
=
d
.
length
;
y
>=
1
&&
layer
.
close
(
d
[
0
].
getAttribute
(
"index"
))}
document
.
body
.
appendChild
(
s
);
var
u
=
e
.
elem
=
a
(
"#"
+
e
.
id
)[
0
];
n
.
success
&&
n
.
success
(
u
),
e
.
index
=
r
++
,
e
.
action
(
n
,
u
)},
c
.
prototype
.
action
=
function
(
e
,
t
){
var
n
=
this
;
e
.
time
&&
(
l
.
timer
[
n
.
index
]
=
setTimeout
(
function
(){
layer
.
close
(
n
.
index
)},
1
e3
*
e
.
time
));
var
a
=
function
(){
var
t
=
this
.
getAttribute
(
"type"
);
0
==
t
?(
e
.
no
&&
e
.
no
(),
layer
.
close
(
n
.
index
)):
e
.
yes
?
e
.
yes
(
n
.
index
):
layer
.
close
(
n
.
index
)};
if
(
e
.
btn
)
for
(
var
s
=
t
[
i
](
"layui-m-layerbtn"
)[
0
].
children
,
r
=
s
.
length
,
o
=
0
;
o
<
r
;
o
++
)
l
.
touch
(
s
[
o
],
a
);
if
(
e
.
shade
&&
e
.
shadeClose
){
var
c
=
t
[
i
](
"layui-m-layershade"
)[
0
];
l
.
touch
(
c
,
function
(){
layer
.
close
(
n
.
index
,
e
.
end
)})}
e
.
end
&&
(
l
.
end
[
n
.
index
]
=
e
.
end
)},
e
.
layer
=
{
v
:
"2.0"
,
index
:
r
,
open
:
function
(
e
){
var
t
=
new
c
(
e
||
{});
return
t
.
index
},
close
:
function
(
e
){
var
n
=
a
(
"#"
+
o
[
0
]
+
e
)[
0
];
n
&&
(
n
.
innerHTML
=
""
,
t
.
body
.
removeChild
(
n
),
clearTimeout
(
l
.
timer
[
e
]),
delete
l
.
timer
[
e
],
"function"
==
typeof
l
.
end
[
e
]
&&
l
.
end
[
e
](),
delete
l
.
end
[
e
])},
closeAll
:
function
(){
for
(
var
e
=
t
[
i
](
o
[
0
]),
n
=
0
,
a
=
e
.
length
;
n
<
a
;
n
++
)
layer
.
close
(
0
|
e
[
0
].
getAttribute
(
"index"
))}},
"function"
==
typeof
define
?
define
(
function
(){
return
layer
}):
function
(){
var
e
=
document
.
scripts
,
n
=
e
[
e
.
length
-
1
],
i
=
n
.
src
,
a
=
i
.
substring
(
0
,
i
.
lastIndexOf
(
"/"
)
+
1
);
n
.
getAttribute
(
"merge"
)
||
document
.
head
.
appendChild
(
function
(){
var
e
=
t
.
createElement
(
"link"
);
return
e
.
href
=
a
+
"need/layer.css?2.0"
,
e
.
type
=
"text/css"
,
e
.
rel
=
"styleSheet"
,
e
.
id
=
"layermcss"
,
e
}())}()}(
window
);
\ No newline at end of file
xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/need/layer.css
deleted
100755 → 0
浏览文件 @
482ea3b5
.layui-m-layer
{
position
:
relative
;
z-index
:
19891014
}
.layui-m-layer
*
{
-webkit-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
box-sizing
:
content-box
}
.layui-m-layermain
,
.layui-m-layershade
{
position
:
fixed
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
}
.layui-m-layershade
{
background-color
:
rgba
(
0
,
0
,
0
,
.7
);
pointer-events
:
auto
}
.layui-m-layermain
{
display
:
table
;
font-family
:
Helvetica
,
arial
,
sans-serif
;
pointer-events
:
none
}
.layui-m-layermain
.layui-m-layersection
{
display
:
table-cell
;
vertical-align
:
middle
;
text-align
:
center
}
.layui-m-layerchild
{
position
:
relative
;
display
:
inline-block
;
text-align
:
left
;
background-color
:
#fff
;
font-size
:
14px
;
border-radius
:
5px
;
box-shadow
:
0
0
8px
rgba
(
0
,
0
,
0
,
.1
);
pointer-events
:
auto
;
-webkit-overflow-scrolling
:
touch
;
-webkit-animation-fill-mode
:
both
;
animation-fill-mode
:
both
;
-webkit-animation-duration
:
.2s
;
animation-duration
:
.2s
}
@-webkit-keyframes
layui-m-anim-scale
{
0
%
{
opacity
:
0
;
-webkit-transform
:
scale
(
.5
);
transform
:
scale
(
.5
)}
100
%
{
opacity
:
1
;
-webkit-transform
:
scale
(
1
);
transform
:
scale
(
1
)}}
@keyframes
layui-m-anim-scale
{
0
%
{
opacity
:
0
;
-webkit-transform
:
scale
(
.5
);
transform
:
scale
(
.5
)}
100
%
{
opacity
:
1
;
-webkit-transform
:
scale
(
1
);
transform
:
scale
(
1
)}}
.layui-m-anim-scale
{
animation-name
:
layui-m-anim-scale
;
-webkit-animation-name
:
layui-m-anim-scale
}
@-webkit-keyframes
layui-m-anim-up
{
0
%
{
opacity
:
0
;
-webkit-transform
:
translateY
(
800px
);
transform
:
translateY
(
800px
)}
100
%
{
opacity
:
1
;
-webkit-transform
:
translateY
(
0
);
transform
:
translateY
(
0
)}}
@keyframes
layui-m-anim-up
{
0
%
{
opacity
:
0
;
-webkit-transform
:
translateY
(
800px
);
transform
:
translateY
(
800px
)}
100
%
{
opacity
:
1
;
-webkit-transform
:
translateY
(
0
);
transform
:
translateY
(
0
)}}
.layui-m-anim-up
{
-webkit-animation-name
:
layui-m-anim-up
;
animation-name
:
layui-m-anim-up
}
.layui-m-layer0
.layui-m-layerchild
{
width
:
90%
;
max-width
:
640px
}
.layui-m-layer1
.layui-m-layerchild
{
border
:
none
;
border-radius
:
0
}
.layui-m-layer2
.layui-m-layerchild
{
width
:
auto
;
max-width
:
260px
;
min-width
:
40px
;
border
:
none
;
background
:
0
0
;
box-shadow
:
none
;
color
:
#fff
}
.layui-m-layerchild
h3
{
padding
:
0
10px
;
height
:
60px
;
line-height
:
60px
;
font-size
:
16px
;
font-weight
:
400
;
border-radius
:
5px
5px
0
0
;
text-align
:
center
}
.layui-m-layerbtn
span
,
.layui-m-layerchild
h3
{
text-overflow
:
ellipsis
;
overflow
:
hidden
;
white-space
:
nowrap
}
.layui-m-layercont
{
padding
:
50px
30px
;
line-height
:
22px
;
text-align
:
center
}
.layui-m-layer1
.layui-m-layercont
{
padding
:
0
;
text-align
:
left
}
.layui-m-layer2
.layui-m-layercont
{
text-align
:
center
;
padding
:
0
;
line-height
:
0
}
.layui-m-layer2
.layui-m-layercont
i
{
width
:
25px
;
height
:
25px
;
margin-left
:
8px
;
display
:
inline-block
;
background-color
:
#fff
;
border-radius
:
100%
;
-webkit-animation
:
layui-m-anim-loading
1.4s
infinite
ease-in-out
;
animation
:
layui-m-anim-loading
1.4s
infinite
ease-in-out
;
-webkit-animation-fill-mode
:
both
;
animation-fill-mode
:
both
}
.layui-m-layerbtn
,
.layui-m-layerbtn
span
{
position
:
relative
;
text-align
:
center
;
border-radius
:
0
0
5px
5px
}
.layui-m-layer2
.layui-m-layercont
p
{
margin-top
:
20px
}
@-webkit-keyframes
layui-m-anim-loading
{
0
%,
100
%,
80
%
{
transform
:
scale
(
0
);
-webkit-transform
:
scale
(
0
)}
40
%
{
transform
:
scale
(
1
);
-webkit-transform
:
scale
(
1
)}}
@keyframes
layui-m-anim-loading
{
0
%,
100
%,
80
%
{
transform
:
scale
(
0
);
-webkit-transform
:
scale
(
0
)}
40
%
{
transform
:
scale
(
1
);
-webkit-transform
:
scale
(
1
)}}
.layui-m-layer2
.layui-m-layercont
i
:first-child
{
margin-left
:
0
;
-webkit-animation-delay
:
-.32s
;
animation-delay
:
-.32s
}
.layui-m-layer2
.layui-m-layercont
i
.layui-m-layerload
{
-webkit-animation-delay
:
-.16s
;
animation-delay
:
-.16s
}
.layui-m-layer2
.layui-m-layercont
>
div
{
line-height
:
22px
;
padding-top
:
7px
;
margin-bottom
:
20px
;
font-size
:
14px
}
.layui-m-layerbtn
{
display
:
box
;
display
:
-moz-box
;
display
:
-webkit-box
;
width
:
100%
;
height
:
50px
;
line-height
:
50px
;
font-size
:
0
;
border-top
:
1px
solid
#D0D0D0
;
background-color
:
#F2F2F2
}
.layui-m-layerbtn
span
{
display
:
block
;
-moz-box-flex
:
1
;
box-flex
:
1
;
-webkit-box-flex
:
1
;
font-size
:
14px
;
cursor
:
pointer
}
.layui-m-layerbtn
span
[
yes
]
{
color
:
#40AFFE
}
.layui-m-layerbtn
span
[
no
]
{
border-right
:
1px
solid
#D0D0D0
;
border-radius
:
0
0
0
5px
}
.layui-m-layerbtn
span
:active
{
background-color
:
#F6F6F6
}
.layui-m-layerend
{
position
:
absolute
;
right
:
7px
;
top
:
10px
;
width
:
30px
;
height
:
30px
;
border
:
0
;
font-weight
:
400
;
background
:
0
0
;
cursor
:
pointer
;
-webkit-appearance
:
none
;
font-size
:
30px
}
.layui-m-layerend
::after
,
.layui-m-layerend
::before
{
position
:
absolute
;
left
:
5px
;
top
:
15px
;
content
:
''
;
width
:
18px
;
height
:
1px
;
background-color
:
#999
;
transform
:
rotate
(
45deg
);
-webkit-transform
:
rotate
(
45deg
);
border-radius
:
3px
}
.layui-m-layerend
::after
{
transform
:
rotate
(
-45deg
);
-webkit-transform
:
rotate
(
-45deg
)}
body
.layui-m-layer
.layui-m-layer-footer
{
position
:
fixed
;
width
:
95%
;
max-width
:
100%
;
margin
:
0
auto
;
left
:
0
;
right
:
0
;
bottom
:
10px
;
background
:
0
0
}
.layui-m-layer-footer
.layui-m-layercont
{
padding
:
20px
;
border-radius
:
5px
5px
0
0
;
background-color
:
rgba
(
255
,
255
,
255
,
.8
)}
.layui-m-layer-footer
.layui-m-layerbtn
{
display
:
block
;
height
:
auto
;
background
:
0
0
;
border-top
:
none
}
.layui-m-layer-footer
.layui-m-layerbtn
span
{
background-color
:
rgba
(
255
,
255
,
255
,
.8
)}
.layui-m-layer-footer
.layui-m-layerbtn
span
[
no
]
{
color
:
#FD482C
;
border-top
:
1px
solid
#c2c2c2
;
border-radius
:
0
0
5px
5px
}
.layui-m-layer-footer
.layui-m-layerbtn
span
[
yes
]
{
margin-top
:
10px
;
border-radius
:
5px
}
body
.layui-m-layer
.layui-m-layer-msg
{
width
:
auto
;
max-width
:
90%
;
margin
:
0
auto
;
bottom
:
-150px
;
background-color
:
rgba
(
0
,
0
,
0
,
.7
);
color
:
#fff
}
.layui-m-layer-msg
.layui-m-layercont
{
padding
:
10px
20px
}
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论