From c732db29eef46730f9d9b31fe00be73643c6163d Mon Sep 17 00:00:00 2001
From: songjianet <1778651752@qq.com>
Date: Fri, 1 Jul 2022 07:08:47 +0800
Subject: [PATCH] [Refactor][UI] Refactor environment manage using NSpace
 component. (#10702)

---
 .../environment-manage/index.module.scss      | 43 ----------
 .../security/environment-manage/index.tsx     | 79 +++++++++----------
 2 files changed, 39 insertions(+), 83 deletions(-)
 delete mode 100644 dolphinscheduler-ui/src/views/security/environment-manage/index.module.scss

diff --git a/dolphinscheduler-ui/src/views/security/environment-manage/index.module.scss b/dolphinscheduler-ui/src/views/security/environment-manage/index.module.scss
deleted file mode 100644
index de6cf70c65..0000000000
--- a/dolphinscheduler-ui/src/views/security/environment-manage/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/security/environment-manage/index.tsx b/dolphinscheduler-ui/src/views/security/environment-manage/index.tsx
index 9a82baf904..1c52f5fc4f 100644
--- a/dolphinscheduler-ui/src/views/security/environment-manage/index.tsx
+++ b/dolphinscheduler-ui/src/views/security/environment-manage/index.tsx
@@ -22,14 +22,13 @@ import {
   NDataTable,
   NIcon,
   NInput,
-  NPagination
+  NPagination,
+  NSpace
 } from 'naive-ui'
 import { SearchOutlined } from '@vicons/antd'
 import { useI18n } from 'vue-i18n'
 import { useTable } from './use-table'
-import Card from '@/components/card'
 import EnvironmentModal from './components/environment-modal'
-import styles from './index.module.scss'
 
 const environmentManage = defineComponent({
   name: 'environment-manage',
@@ -102,20 +101,18 @@ const environmentManage = defineComponent({
     } = this
 
     return (
-      <div>
-        <NCard>
-          <div class={styles['search-card']}>
-            <div>
-              <NButton
-                size='small'
-                type='primary'
-                onClick={handleModalChange}
-                class='btn-create-environment'
-              >
-                {t('security.environment.create_environment')}
-              </NButton>
-            </div>
-            <div class={styles.box}>
+      <NSpace vertical>
+        <NCard size='small'>
+          <NSpace justify='space-between'>
+            <NButton
+              size='small'
+              type='primary'
+              onClick={handleModalChange}
+              class='btn-create-environment'
+            >
+              {t('security.environment.create_environment')}
+            </NButton>
+            <NSpace>
               <NInput
                 size='small'
                 clearable
@@ -131,30 +128,32 @@ const environmentManage = defineComponent({
                   )
                 }}
               </NButton>
-            </div>
-          </div>
+            </NSpace>
+          </NSpace>
         </NCard>
-        <Card class={styles['table-card']}>
-          <NDataTable
-            loading={loadingRef}
-            row-class-name='items'
-            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}
+              row-class-name='items'
+              columns={this.columns}
+              data={this.tableData}
+              scrollX={this.tableWidth}
             />
-          </div>
-        </Card>
+            <NSpace>
+              <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>
         <EnvironmentModal
           showModalRef={this.showModalRef}
           statusRef={this.statusRef}
@@ -162,7 +161,7 @@ const environmentManage = defineComponent({
           onCancelModal={onCancelModal}
           onConfirmModal={onConfirmModal}
         />
-      </div>
+      </NSpace>
     )
   }
 })