From 878cbbc1590de3973b5734bdbe107e252ef14314 Mon Sep 17 00:00:00 2001
From: songjianet <1778651752@qq.com>
Date: Tue, 19 Jul 2022 23:04:54 +0800
Subject: [PATCH] [Refactor][UI] Refactor task result using NSpace component.
 (#11054)

---
 .../task-result/index.module.scss             | 26 --------
 .../views/data-quality/task-result/index.tsx  | 60 +++++++++----------
 2 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 100644 dolphinscheduler-ui/src/views/data-quality/task-result/index.module.scss

diff --git a/dolphinscheduler-ui/src/views/data-quality/task-result/index.module.scss b/dolphinscheduler-ui/src/views/data-quality/task-result/index.module.scss
deleted file mode 100644
index e6b0dfe014..0000000000
--- a/dolphinscheduler-ui/src/views/data-quality/task-result/index.module.scss
+++ /dev/null
@@ -1,26 +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.
- */
-
-.table-card {
-  margin-top: 8px;
-
-  .pagination {
-    margin-top: 20px;
-    display: flex;
-    justify-content: center;
-  }
-}
diff --git a/dolphinscheduler-ui/src/views/data-quality/task-result/index.tsx b/dolphinscheduler-ui/src/views/data-quality/task-result/index.tsx
index 4dfdd9d386..9a4ba39989 100644
--- a/dolphinscheduler-ui/src/views/data-quality/task-result/index.tsx
+++ b/dolphinscheduler-ui/src/views/data-quality/task-result/index.tsx
@@ -25,13 +25,11 @@ import {
   NIcon,
   NDataTable,
   NPagination,
-  NCard
 } from 'naive-ui'
 import { SearchOutlined } from '@vicons/antd'
 import { useTable } from './use-table'
 import { useI18n } from 'vue-i18n'
 import Card from '@/components/card'
-import styles from './index.module.scss'
 
 const TaskResult = defineComponent({
   name: 'task-result',
@@ -83,11 +81,11 @@ const TaskResult = defineComponent({
     const { t, requestTableData, onUpdatePageSize, onSearch, loadingRef } = this
 
     return (
-      <>
-        <NCard>
+      <NSpace vertical>
+        <Card>
           <NSpace justify='end'>
             <NInput
-                  allowInput={this.trim}
+              allowInput={this.trim}
               v-model={[this.searchVal, 'value']}
               size='small'
               placeholder={t('data_quality.task_result.task_name')}
@@ -148,37 +146,35 @@ const TaskResult = defineComponent({
               clearable
             />
             <NButton size='small' type='primary' onClick={onSearch}>
-              {{
-                icon: () => (
-                  <NIcon>
-                    <SearchOutlined />
-                  </NIcon>
-                )
-              }}
+              <NIcon>
+                <SearchOutlined />
+              </NIcon>
             </NButton>
           </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={requestTableData}
-              onUpdatePageSize={onUpdatePageSize}
+        </Card>
+        <Card title={t('menu.task_result')}>
+          <NSpace vertical>
+            <NDataTable
+              loading={loadingRef}
+              columns={this.columns}
+              data={this.tableData}
+              scrollX={this.tableWidth}
             />
-          </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={requestTableData}
+                onUpdatePageSize={onUpdatePageSize}
+              />
+            </NSpace>
+          </NSpace>
         </Card>
-      </>
+      </NSpace>
     )
   }
 })