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/12 06:02:04 UTC

[dolphinscheduler] branch dev updated: [Refactor][UI] Refactor task instance batch using NSpace component. (#11447)

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 dcab16a3eb [Refactor][UI] Refactor task instance batch using NSpace component. (#11447)
dcab16a3eb is described below

commit dcab16a3eb0a68f5b4069c7ac0d92b6ab14d2dbb
Author: songjianet <17...@qq.com>
AuthorDate: Fri Aug 12 14:01:55 2022 +0800

    [Refactor][UI] Refactor task instance batch using NSpace component. (#11447)
---
 .../views/projects/task/instance/batch-task.tsx    | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx b/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
index d88ab9eb4a..b6176e9f16 100644
--- a/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
+++ b/dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx
@@ -30,18 +30,16 @@ import {
   NButton,
   NIcon,
   NDataTable,
-  NPagination,
-  NCard
+  NPagination
 } from 'naive-ui'
 import { SearchOutlined } from '@vicons/antd'
 import { useTable } from './use-table'
 import { useI18n } from 'vue-i18n'
-import Card from '@/components/card'
-import LogModal from '@/components/log-modal'
 import { useAsyncState } from '@vueuse/core'
 import { queryLog } from '@/service/modules/log'
 import { stateType } from '@/common/common'
-import styles from './index.module.scss'
+import Card from '@/components/card'
+import LogModal from '@/components/log-modal'
 
 const BatchTaskInstance = defineComponent({
   name: 'task-instance',
@@ -154,8 +152,8 @@ const BatchTaskInstance = defineComponent({
     } = this
 
     return (
-      <>
-        <NCard>
+      <NSpace vertical>
+        <Card>
           <NSpace justify='end' wrap={false}>
             <NInput
               allowInput={this.trim}
@@ -211,26 +209,28 @@ const BatchTaskInstance = defineComponent({
               }}
             </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('project.task.batch_task')}>
+          <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>
         <LogModal
           showModalRef={this.showModalRef}
@@ -240,7 +240,7 @@ const BatchTaskInstance = defineComponent({
           onConfirmModal={onConfirmModal}
           onRefreshLogs={refreshLogs}
         />
-      </>
+      </NSpace>
     )
   }
 })