Browse Source

[Refactor][UI] Refactor project list using NSpace component. (#11369)

3.1.0-release
songjianet 2 years ago committed by GitHub
parent
commit
334afec066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 43
      dolphinscheduler-ui/src/views/projects/list/index.module.scss
  2. 63
      dolphinscheduler-ui/src/views/projects/list/index.tsx

43
dolphinscheduler-ui/src/views/projects/list/index.module.scss

@ -1,43 +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.
*/
.search-card {
display: flex;
justify-content: space-between;
align-items: center;
.box {
display: flex;
justify-content: flex-end;
align-items: center;
width: 300px;
button {
margin-left: 10px;
}
}
}
.table-card {
margin-top: 8px;
.pagination {
margin-top: 20px;
display: flex;
justify-content: center;
}
}

63
dolphinscheduler-ui/src/views/projects/list/index.tsx

@ -15,11 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
import Card from '@/components/card'
import { SearchOutlined } from '@vicons/antd' import { SearchOutlined } from '@vicons/antd'
import { import {
NButton, NButton,
NCard,
NDataTable, NDataTable,
NIcon, NIcon,
NInput, NInput,
@ -28,9 +26,9 @@ import {
} from 'naive-ui' } from 'naive-ui'
import { defineComponent, getCurrentInstance, onMounted, toRefs, watch } from 'vue' import { defineComponent, getCurrentInstance, onMounted, toRefs, watch } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import ProjectModal from './components/project-modal'
import styles from './index.module.scss'
import { useTable } from './use-table' import { useTable } from './use-table'
import Card from '@/components/card'
import ProjectModal from './components/project-modal'
const list = defineComponent({ const list = defineComponent({
name: 'list', name: 'list',
@ -96,9 +94,9 @@ const list = defineComponent({
render() { render() {
const { t, loadingRef } = this const { t, loadingRef } = this
return ( return (
<div> <NSpace vertical>
<NCard> <Card>
<div class={styles['search-card']}> <NSpace justify='space-between'>
<NButton <NButton
size='small' size='small'
onClick={this.handleModalChange} onClick={this.handleModalChange}
@ -109,7 +107,7 @@ const list = defineComponent({
</NButton> </NButton>
<NSpace> <NSpace>
<NInput <NInput
allowInput={this.trim} allowInput={this.trim}
size='small' size='small'
v-model={[this.searchVal, 'value']} v-model={[this.searchVal, 'value']}
placeholder={t('project.list.project_tips')} placeholder={t('project.list.project_tips')}
@ -121,31 +119,30 @@ const list = defineComponent({
</NIcon> </NIcon>
</NButton> </NButton>
</NSpace> </NSpace>
</div> </NSpace>
</NCard> </Card>
<Card <Card title={t('project.list.project_list')}>
title={t('project.list.project_list')} <NSpace vertical>
class={styles['table-card']} <NDataTable
> loading={loadingRef}
<NDataTable columns={this.columns}
loading={loadingRef} data={this.tableData}
columns={this.columns} scrollX={this.tableWidth}
data={this.tableData} row-class-name='items'
scrollX={this.tableWidth}
row-class-name='items'
/>
<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={this.requestData}
onUpdatePageSize={this.handleChangePageSize}
/> />
</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={this.requestData}
onUpdatePageSize={this.handleChangePageSize}
/>
</NSpace>
</NSpace>
</Card> </Card>
<ProjectModal <ProjectModal
showModalRef={this.showModalRef} showModalRef={this.showModalRef}
@ -154,7 +151,7 @@ const list = defineComponent({
onCancelModal={this.onCancelModal} onCancelModal={this.onCancelModal}
onConfirmModal={this.onConfirmModal} onConfirmModal={this.onConfirmModal}
/> />
</div> </NSpace>
) )
} }
}) })

Loading…
Cancel
Save