Browse Source

[Refactor][UI] Refactor task instance stream using NSpace component. (#11454)

3.1.0-release
songjianet 2 years ago committed by GitHub
parent
commit
2240b6e708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
  2. 26
      dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss
  3. 64
      dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx

10
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>

26
dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss

@ -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;
}
}

64
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>
)
}
})

Loading…
Cancel
Save