Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
58f21db6
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
58f21db6
编写于
5月 23, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
上级
2ef34937
70a44bd0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
35 deletion
+54
-35
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+13
-10
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+19
-16
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
...e/pages/resource/pages/file/pages/list/_source/rename.vue
+11
-4
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
...ages/resource/pages/udf/pages/resource/_source/rename.vue
+10
-4
未找到文件。
escheduler-ui/.env
浏览文件 @
58f21db6
# 后端接口地址
API_BASE = http://192.168.
xx.xx
:12345
API_BASE = http://192.168.
221.188
:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
58f21db6
...
...
@@ -6,7 +6,7 @@
<th
width=
"50"
>
<x-checkbox
@
on-change=
"_topCheckBoxClick"
v-model=
"checkAll"
></x-checkbox>
</th>
<th>
<th
width=
"40"
>
<span>
{{
$t
(
'
#
'
)
}}
</span>
</th>
<th>
...
...
@@ -33,7 +33,7 @@
</tr>
<tr
v-for=
"(item, $index) in list"
:key=
"item.id"
>
<td
width=
"50"
><x-checkbox
v-model=
"item.isCheck"
@
on-change=
"_arrDelChange"
></x-checkbox></td>
<td>
<td
width=
"50"
>
<span>
{{
parseInt
(
pageNo
===
1
?
(
$index
+
1
)
:
((
$index
+
1
)
+
(
pageSize
*
(
pageNo
-
1
))))
}}
</span>
</td>
<td>
...
...
@@ -90,7 +90,7 @@
</tr>
</table>
</div>
<x-button
s
tyle=
"position: absolute; bottom: -52px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
批量
删除
</x-button>
<x-button
s
ize=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
删除
</x-button>
</div>
</template>
<
script
>
...
...
@@ -308,21 +308,24 @@
}
},
watch
:
{
processList
(
a
)
{
this
.
list
=
[]
setTimeout
(()
=>
{
this
.
list
=
a
})
processList
:
{
handler
(
a
)
{
this
.
checkAll
=
false
this
.
list
=
[]
setTimeout
(()
=>
{
this
.
list
=
_
.
cloneDeep
(
a
)
})
},
immediate
:
true
,
deep
:
true
},
pageNo
()
{
this
.
checkAll
=
false
this
.
strDelete
=
''
}
},
created
()
{
},
mounted
()
{
this
.
list
=
this
.
processList
},
components
:
{
}
}
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
58f21db6
...
...
@@ -6,13 +6,13 @@
<th
width=
"50"
>
<x-checkbox
@
on-change=
"_topCheckBoxClick"
v-model=
"checkAll"
></x-checkbox>
</th>
<th>
<th
width=
"40"
>
<span>
{{
$t
(
'
#
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Process Name
'
)
}}
</span>
</th>
<th
width=
"120"
>
<th>
<span>
{{
$t
(
'
Run Type
'
)
}}
</span>
</th>
<th
width=
"140"
>
...
...
@@ -21,10 +21,10 @@
<th
width=
"140"
>
<span>
{{
$t
(
'
End Time
'
)
}}
</span>
</th>
<th
width=
"
9
0"
>
<th
width=
"
7
0"
>
<span>
{{
$t
(
'
Duration
'
)
}}
s
</span>
</th>
<th
width=
"7
2
"
>
<th
width=
"7
0
"
>
<span>
{{
$t
(
'
Run Times
'
)
}}
</span>
</th>
<th
width=
"100"
>
...
...
@@ -36,13 +36,13 @@
<th
width=
"50"
>
<span>
{{
$t
(
'
State
'
)
}}
</span>
</th>
<th
width=
"2
6
0"
>
<th
width=
"2
2
0"
>
<span>
{{
$t
(
'
Operation
'
)
}}
</span>
</th>
</tr>
<tr
v-for=
"(item, $index) in list"
:key=
"item.id"
>
<td
width=
"50"
><x-checkbox
v-model=
"item.isCheck"
@
on-change=
"_arrDelChange"
></x-checkbox></td>
<td>
<td
width=
"50"
>
<span>
{{
parseInt
(
pageNo
===
1
?
(
$index
+
1
)
:
((
$index
+
1
)
+
(
pageSize
*
(
pageNo
-
1
))))
}}
</span>
</td>
<td>
...
...
@@ -54,8 +54,8 @@
<span
v-if=
"item.endTime"
>
{{
item
.
endTime
|
formatDate
}}
</span>
<span
v-if=
"!item.endTime"
>
-
</span>
</td>
<td><span>
{{
item
.
duration
||
'
-
'
}}
</span></td>
<td><span>
{{
item
.
runTimes
}}
</span></td>
<td
width=
"70"
><span>
{{
item
.
duration
||
'
-
'
}}
</span></td>
<td
width=
"70"
><span>
{{
item
.
runTimes
}}
</span></td>
<td>
<span
v-if=
"item.host"
>
{{
item
.
host
}}
</span>
<span
v-if=
"!item.host"
>
-
</span>
...
...
@@ -249,7 +249,7 @@
</tr>
</table>
</div>
<x-button
s
tyle=
"position: absolute; bottom: -52px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
批量
删除
</x-button>
<x-button
s
ize=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
删除
</x-button>
</div>
</template>
<
script
>
...
...
@@ -480,21 +480,24 @@
}
},
watch
:
{
processInstanceList
(
a
)
{
this
.
list
=
[]
setTimeout
(()
=>
{
this
.
list
=
this
.
_listDataHandle
(
a
)
})
processInstanceList
:
{
handler
(
a
)
{
this
.
checkAll
=
false
this
.
list
=
[]
setTimeout
(()
=>
{
this
.
list
=
_
.
cloneDeep
(
this
.
_listDataHandle
(
a
))
})
},
immediate
:
true
,
deep
:
true
},
pageNo
()
{
this
.
checkAll
=
false
this
.
strDelete
=
''
}
},
created
()
{
},
mounted
()
{
this
.
list
=
this
.
_listDataHandle
(
this
.
processInstanceList
)
},
components
:
{
}
}
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
浏览文件 @
58f21db6
...
...
@@ -49,10 +49,16 @@
methods
:
{
_ok
(
fn
)
{
this
.
_verification
().
then
(
res
=>
{
return
this
.
store
.
dispatch
(
'
resource/resourceVerifyName
'
,
{
name
:
this
.
name
,
type
:
'
FILE
'
})
if
(
this
.
name
===
this
.
item
.
alias
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
desc
===
this
.
item
.
desc
?
reject
({
msg
:
'
内容未修改
'
})
:
resolve
()
})
}
else
{
return
this
.
store
.
dispatch
(
'
resource/resourceVerifyName
'
,
{
name
:
this
.
name
,
type
:
'
FILE
'
})
}
}).
then
(
res
=>
{
return
this
.
store
.
dispatch
(
'
resource/resourceRename
'
,
{
name
:
this
.
name
,
...
...
@@ -78,6 +84,7 @@
}
else
{
resolve
()
}
})
}
},
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
浏览文件 @
58f21db6
...
...
@@ -49,10 +49,16 @@
methods
:
{
_ok
(
fn
)
{
this
.
_verification
().
then
(
res
=>
{
return
this
.
store
.
dispatch
(
'
resource/resourceVerifyName
'
,
{
name
:
this
.
name
,
type
:
'
UDF
'
})
if
(
this
.
name
===
this
.
item
.
alias
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
desc
===
this
.
item
.
desc
?
reject
({
msg
:
'
内容未修改
'
})
:
resolve
()
})
}
else
{
return
this
.
store
.
dispatch
(
'
resource/resourceVerifyName
'
,
{
name
:
this
.
name
,
type
:
'
UDF
'
})
}
}).
then
(
res
=>
{
return
this
.
store
.
dispatch
(
'
resource/resourceRename
'
,
{
name
:
this
.
name
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录