You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by wa...@apache.org on 2022/08/12 09:07:51 UTC
[dolphinscheduler] branch dev updated: [Refactor][UI] Refactor task instance stream using NSpace component. (#11454)
This is an automated email from the ASF dual-hosted git repository.
wanggenhua pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2240b6e708 [Refactor][UI] Refactor task instance stream using NSpace component. (#11454)
2240b6e708 is described below
commit 2240b6e708fc0b810969305f1802d4414a082df8
Author: songjianet <17...@qq.com>
AuthorDate: Fri Aug 12 17:07:43 2022 +0800
[Refactor][UI] Refactor task instance stream using NSpace component. (#11454)
---
.../views/projects/task/instance/batch-task.tsx | 10 +---
.../views/projects/task/instance/index.module.scss | 26 ---------
.../views/projects/task/instance/stream-task.tsx | 64 ++++++++++------------
3 files changed, 33 insertions(+), 67 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx b/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
index b6176e9f16..548e9c500d 100644
--- a/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
+++ b/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
@@ -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>
diff --git a/dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss b/dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss
deleted file mode 100644
index e6b0dfe014..0000000000
--- a/dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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;
- }
-}
diff --git a/dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx b/dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx
index 18ab06e802..5a6493af09 100644
--- a/dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx
+++ b/dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx
@@ -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 (
- <>
- <NCard>
+ <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>
)
}
})