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/06/30 03:28:40 UTC
[dolphinscheduler] branch dev updated: [Refactor][UI] Refactor k8s namespace manage using NSpace component. (#10682)
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 a90e5746fc [Refactor][UI] Refactor k8s namespace manage using NSpace component. (#10682)
a90e5746fc is described below
commit a90e5746fc3d6103c00ad39715f58ed54eb1700f
Author: songjianet <17...@qq.com>
AuthorDate: Thu Jun 30 11:28:33 2022 +0800
[Refactor][UI] Refactor k8s namespace manage using NSpace component. (#10682)
---
.../k8s-namespace-manage/index.module.scss | 32 ------------
.../views/security/k8s-namespace-manage/index.tsx | 60 +++++++++++-----------
2 files changed, 29 insertions(+), 63 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.module.scss b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.module.scss
deleted file mode 100644
index 12e457b748..0000000000
--- a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.module.scss
+++ /dev/null
@@ -1,32 +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;
-}
-
-.table-card {
- margin-top: 8px;
-
- .pagination {
- margin-top: 20px;
- display: flex;
- justify-content: center;
- }
-}
diff --git a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
index baaff8ac99..283bdce20c 100644
--- a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
+++ b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
@@ -28,9 +28,7 @@ import {
import { SearchOutlined } from '@vicons/antd'
import { useI18n } from 'vue-i18n'
import { useTable } from './use-table'
-import Card from '@/components/card'
import K8sNamespaceModal from './components/k8s-namespace-modal'
-import styles from './index.module.scss'
const k8sNamespaceManage = defineComponent({
name: 'k8s-namespace-manage',
@@ -103,14 +101,12 @@ const k8sNamespaceManage = defineComponent({
} = this
return (
- <div>
- <NCard>
- <div class={styles['search-card']}>
- <div>
- <NButton size='small' type='primary' onClick={handleModalChange}>
- {t('security.k8s_namespace.create_namespace')}
- </NButton>
- </div>
+ <NSpace vertical>
+ <NCard size='small'>
+ <NSpace justify='space-between'>
+ <NButton size='small' type='primary' onClick={handleModalChange}>
+ {t('security.k8s_namespace.create_namespace')}
+ </NButton>
<NSpace>
<NInput
size='small'
@@ -128,28 +124,30 @@ const k8sNamespaceManage = defineComponent({
}}
</NButton>
</NSpace>
- </div>
+ </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={requestData}
- onUpdatePageSize={onUpdatePageSize}
+ <NCard size='small'>
+ <NSpace vertical>
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ scrollX={this.tableWidth}
/>
- </div>
- </Card>
+ <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={requestData}
+ onUpdatePageSize={onUpdatePageSize}
+ />
+ </NSpace>
+ </NSpace>
+ </NCard>
<K8sNamespaceModal
showModalRef={this.showModalRef}
statusRef={this.statusRef}
@@ -157,7 +155,7 @@ const k8sNamespaceManage = defineComponent({
onCancelModal={onCancelModal}
onConfirmModal={onConfirmModal}
/>
- </div>
+ </NSpace>
)
}
})