Browse Source

[Refactor][UI] Refactor task group queue using NSpace component. (#11341)

* [Refactor][UI] Refactor task group queue using NSpace component.

* [Refactor][UI] Refactor token manage using NSpace component.
3.1.0-release
songjianet 2 years ago committed by GitHub
parent
commit
cfb5918e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts
  2. 44
      dolphinscheduler-ui/src/views/resource/task-group/queue/index.module.scss
  3. 37
      dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx

1
dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts

@ -30,7 +30,6 @@ import {
import { execute } from '@/service/modules/executors' import { execute } from '@/service/modules/executors'
import TableAction from './components/table-action' import TableAction from './components/table-action'
import { renderTableTime, runningType } from '@/common/common' import { renderTableTime, runningType } from '@/common/common'
import styles from './index.module.scss'
import { renderStateCell } from '../../task/instance/use-table' import { renderStateCell } from '../../task/instance/use-table'
import { import {
COLUMN_WIDTH_CONFIG, COLUMN_WIDTH_CONFIG,

44
dolphinscheduler-ui/src/views/resource/task-group/queue/index.module.scss

@ -1,44 +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.
*/
.toolbar {
display: flex;
justify-content: flex-end;
align-items: center;
padding: 0 0 0 0;
}
.table-card {
margin-top: 2px;
.table-action {
display: flex;
justify-content: center;
align-items: center;
button {
margin: 0 2px 0 0;
}
div {
margin: 0 2px 0 0;
}
}
.pagination {
margin-top: 20px;
display: flex;
justify-content: center;
}
}

37
dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx

@ -15,27 +15,27 @@
* limitations under the License. * limitations under the License.
*/ */
import { ref, defineComponent, toRefs, reactive, onMounted, Ref, getCurrentInstance } from 'vue' import { ref, defineComponent, toRefs, reactive, onMounted, getCurrentInstance } from 'vue'
import { import {
NButton, NButton,
NIcon, NIcon,
NInput, NInput,
NCard,
NDataTable, NDataTable,
NPagination, NPagination,
NSelect, NSelect,
NSpace NSpace
} from 'naive-ui' } from 'naive-ui'
import Card from '@/components/card'
import { SearchOutlined } from '@vicons/antd' import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import styles from './index.module.scss'
import { useTable } from './use-table' import { useTable } from './use-table'
import FormModal from '@/views/resource/task-group/queue/components/form-modal'
import { queryTaskGroupListPaging } from '@/service/modules/task-group' import { queryTaskGroupListPaging } from '@/service/modules/task-group'
import { TaskGroupRes } from '@/service/modules/task-group/types' import { TaskGroupRes } from '@/service/modules/task-group/types'
import { SelectMixedOption } from 'naive-ui/lib/select/src/interface' import { SelectMixedOption } from 'naive-ui/lib/select/src/interface'
import { Router, useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import FormModal from '@/views/resource/task-group/queue/components/form-modal'
import Card from '@/components/card'
import type { Ref } from 'vue'
import type { Router } from 'vue-router'
const taskGroupQueue = defineComponent({ const taskGroupQueue = defineComponent({
name: 'taskGroupQueue', name: 'taskGroupQueue',
@ -158,10 +158,9 @@ const taskGroupQueue = defineComponent({
const { columns } = useTable(updatePriority, resetTableData) const { columns } = useTable(updatePriority, resetTableData)
return ( return (
<div> <NSpace vertical>
<NCard> <Card>
<div class={styles.toolbar}> <NSpace justify='end'>
<NSpace>
<NSelect <NSelect
size='small' size='small'
options={taskGroupOptions} options={taskGroupOptions}
@ -190,13 +189,9 @@ const taskGroupQueue = defineComponent({
</NIcon> </NIcon>
</NButton> </NButton>
</NSpace> </NSpace>
</div> </Card>
</NCard> <Card title={t('resource.task_group_queue.queue')}>
<Card <NSpace vertical>
class={styles['table-card']}
title={t('resource.task_group_queue.queue')}
>
<div>
<NDataTable <NDataTable
loading={loadingRef} loading={loadingRef}
columns={columns} columns={columns}
@ -205,7 +200,7 @@ const taskGroupQueue = defineComponent({
striped striped
scrollX={this.tableWidth} scrollX={this.tableWidth}
/> />
<div class={styles.pagination}> <NSpace justify='center'>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}
v-model:page-size={this.pageSize} v-model:page-size={this.pageSize}
@ -216,8 +211,8 @@ const taskGroupQueue = defineComponent({
onUpdatePage={resetTableData} onUpdatePage={resetTableData}
onUpdatePageSize={onUpdatePageSize} onUpdatePageSize={onUpdatePageSize}
/> />
</div> </NSpace>
</div> </NSpace>
</Card> </Card>
{showModalRef && ( {showModalRef && (
<FormModal <FormModal
@ -227,7 +222,7 @@ const taskGroupQueue = defineComponent({
data={updateItemData} data={updateItemData}
/> />
)} )}
</div> </NSpace>
) )
} }
}) })

Loading…
Cancel
Save