You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/08/09 09:58:57 UTC
[dolphinscheduler] branch dev updated: [Refactor][UI] Refactor project list using NSpace component. (#11369)
This is an automated email from the ASF dual-hosted git repository.
songjian 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 334afec066 [Refactor][UI] Refactor project list using NSpace component. (#11369)
334afec066 is described below
commit 334afec066b1ac580ad1aee7dc7922ff63a3c68e
Author: songjianet <17...@qq.com>
AuthorDate: Tue Aug 9 17:58:47 2022 +0800
[Refactor][UI] Refactor project list using NSpace component. (#11369)
---
.../src/views/projects/list/index.module.scss | 43 ---------------
.../src/views/projects/list/index.tsx | 63 +++++++++++-----------
2 files changed, 30 insertions(+), 76 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/projects/list/index.module.scss b/dolphinscheduler-ui/src/views/projects/list/index.module.scss
deleted file mode 100644
index de6cf70c65..0000000000
--- a/dolphinscheduler-ui/src/views/projects/list/index.module.scss
+++ /dev/null
@@ -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;
- }
-}
diff --git a/dolphinscheduler-ui/src/views/projects/list/index.tsx b/dolphinscheduler-ui/src/views/projects/list/index.tsx
index 52c92c710d..393b41372b 100644
--- a/dolphinscheduler-ui/src/views/projects/list/index.tsx
+++ b/dolphinscheduler-ui/src/views/projects/list/index.tsx
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-import Card from '@/components/card'
import { SearchOutlined } from '@vicons/antd'
import {
NButton,
- NCard,
NDataTable,
NIcon,
NInput,
@@ -28,9 +26,9 @@ import {
} from 'naive-ui'
import { defineComponent, getCurrentInstance, onMounted, toRefs, watch } from 'vue'
import { useI18n } from 'vue-i18n'
-import ProjectModal from './components/project-modal'
-import styles from './index.module.scss'
import { useTable } from './use-table'
+import Card from '@/components/card'
+import ProjectModal from './components/project-modal'
const list = defineComponent({
name: 'list',
@@ -96,9 +94,9 @@ const list = defineComponent({
render() {
const { t, loadingRef } = this
return (
- <div>
- <NCard>
- <div class={styles['search-card']}>
+ <NSpace vertical>
+ <Card>
+ <NSpace justify='space-between'>
<NButton
size='small'
onClick={this.handleModalChange}
@@ -109,7 +107,7 @@ const list = defineComponent({
</NButton>
<NSpace>
<NInput
- allowInput={this.trim}
+ allowInput={this.trim}
size='small'
v-model={[this.searchVal, 'value']}
placeholder={t('project.list.project_tips')}
@@ -121,31 +119,30 @@ const list = defineComponent({
</NIcon>
</NButton>
</NSpace>
- </div>
- </NCard>
- <Card
- title={t('project.list.project_list')}
- class={styles['table-card']}
- >
- <NDataTable
- loading={loadingRef}
- columns={this.columns}
- data={this.tableData}
- 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}
+ </NSpace>
+ </Card>
+ <Card title={t('project.list.project_list')}>
+ <NSpace vertical>
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ scrollX={this.tableWidth}
+ row-class-name='items'
/>
- </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>
<ProjectModal
showModalRef={this.showModalRef}
@@ -154,7 +151,7 @@ const list = defineComponent({
onCancelModal={this.onCancelModal}
onConfirmModal={this.onConfirmModal}
/>
- </div>
+ </NSpace>
)
}
})