Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yiicenne
DolphinScheduler
提交
2240b6e7
DolphinScheduler
项目概览
yiicenne
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
2240b6e7
编写于
8月 12, 2022
作者:
S
songjianet
提交者:
GitHub
8月 12, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Refactor][UI] Refactor task instance stream using NSpace component. (#11454)
上级
376d0a09
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
67 deletion
+33
-67
dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
...eduler-ui/src/views/projects/task/instance/batch-task.tsx
+3
-7
dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss
...ler-ui/src/views/projects/task/instance/index.module.scss
+0
-26
dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx
...duler-ui/src/views/projects/task/instance/stream-task.tsx
+30
-34
未找到文件。
dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
浏览文件 @
2240b6e7
...
...
@@ -200,13 +200,9 @@ const BatchTaskInstance = defineComponent({
clearable
/>
<
NButton
size
=
'small'
type
=
'primary'
onClick
=
{
onSearch
}
>
{
{
icon
:
()
=>
(
<
NIcon
>
<
SearchOutlined
/>
</
NIcon
>
)
}
}
<
NIcon
>
<
SearchOutlined
/>
</
NIcon
>
</
NButton
>
</
NSpace
>
</
Card
>
...
...
dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss
已删除
100644 → 0
浏览文件 @
376d0a09
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
.table-card
{
margin-top
:
8px
;
.pagination
{
margin-top
:
20px
;
display
:
flex
;
justify-content
:
center
;
}
}
dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx
浏览文件 @
2240b6e7
...
...
@@ -31,18 +31,16 @@ import {
NButton
,
NIcon
,
NDataTable
,
NPagination
,
NCard
NPagination
}
from
'
naive-ui
'
import
{
SearchOutlined
}
from
'
@vicons/antd
'
import
{
useTable
}
from
'
./use-stream-table
'
import
{
useI18n
}
from
'
vue-i18n
'
import
Card
from
'
@/components/card
'
import
LogModal
from
'
@/components/log-modal
'
import
{
useAsyncState
}
from
'
@vueuse/core
'
import
{
queryLog
}
from
'
@/service/modules/log
'
import
{
streamStateType
}
from
'
@/common/common
'
import
styles
from
'
./index.module.scss
'
import
Card
from
'
@/components/card
'
import
LogModal
from
'
@/components/log-modal
'
const
BatchTaskInstance
=
defineComponent
({
name
:
'
task-instance
'
,
...
...
@@ -149,8 +147,8 @@ const BatchTaskInstance = defineComponent({
}
=
this
return
(
<>
<
N
Card
>
<
NSpace
vertical
>
<
Card
>
<
NSpace
justify
=
'end'
wrap
=
{
false
}
>
<
NInput
allowInput
=
{
this
.
trim
}
...
...
@@ -197,35 +195,33 @@ const BatchTaskInstance = defineComponent({
clearable
/>
<
NButton
size
=
'small'
type
=
'primary'
onClick
=
{
onSearch
}
>
{
{
icon
:
()
=>
(
<
NIcon
>
<
SearchOutlined
/>
</
NIcon
>
)
}
}
<
NIcon
>
<
SearchOutlined
/>
</
NIcon
>
</
NButton
>
</
NSpace
>
</
NCard
>
<
Card
class
=
{
styles
[
'
table-card
'
]
}
>
<
NDataTable
loading
=
{
loadingRef
}
columns
=
{
this
.
columns
}
data
=
{
this
.
tableData
}
scrollX
=
{
this
.
tableWidth
}
/>
<
div
class
=
{
styles
.
pagination
}
>
<
NPagination
v
-
model
:
page
=
{
this
.
page
}
v
-
model
:
page
-
size
=
{
this
.
pageSize
}
page
-
count
=
{
this
.
totalPage
}
show
-
size
-
picker
page
-
sizes
=
{
[
10
,
30
,
50
]
}
show
-
quick
-
jumper
onUpdatePage
=
{
getTableData
}
onUpdatePageSize
=
{
onUpdatePageSize
}
</
Card
>
<
Card
title
=
{
t
(
'
project.task.stream_task
'
)
}
>
<
NSpace
vertical
>
<
NDataTable
loading
=
{
loadingRef
}
columns
=
{
this
.
columns
}
data
=
{
this
.
tableData
}
scrollX
=
{
this
.
tableWidth
}
/>
</
div
>
<
NSpace
justify
=
'center'
>
<
NPagination
v
-
model
:
page
=
{
this
.
page
}
v
-
model
:
page
-
size
=
{
this
.
pageSize
}
page
-
count
=
{
this
.
totalPage
}
show
-
size
-
picker
page
-
sizes
=
{
[
10
,
30
,
50
]
}
show
-
quick
-
jumper
onUpdatePage
=
{
getTableData
}
onUpdatePageSize
=
{
onUpdatePageSize
}
/>
</
NSpace
>
</
NSpace
>
</
Card
>
<
LogModal
showModalRef
=
{
this
.
showModalRef
}
...
...
@@ -235,7 +231,7 @@ const BatchTaskInstance = defineComponent({
onConfirmModal
=
{
onConfirmModal
}
onRefreshLogs
=
{
refreshLogs
}
/>
</>
</
NSpace
>
)
}
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录