[Refactor][UI] Refactor task instance stream using NSpace component. (#11454)

dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx

@@ -200,13 +200,9 @@ const BatchTaskInstance = defineComponent({
               clearable
             />
             <NButton size='small' type='primary' onClick={onSearch}>
-              {{
+              <NIcon>
-                icon: () => (
+                <SearchOutlined />
-                  <NIcon>
+              </NIcon>
-                    <SearchOutlined />
-                  </NIcon>
-                )
-              }}
             </NButton>
           </NSpace>
         </Card>

dolphinscheduler-ui/src/views/projects/task/instance/index.module.scss

@@ -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;
-  }
-}

dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx

@@ -31,18 +31,16 @@ import {
   NButton,
   NIcon,
   NDataTable,
-  NPagination,
+  NPagination
-  NCard
 } from 'naive-ui'
 import { SearchOutlined } from '@vicons/antd'
 import { useTable } from './use-stream-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 { streamStateType } 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',
@@ -149,8 +147,8 @@ const BatchTaskInstance = defineComponent({
     } = this
 
     return (
-      <>
+      <NSpace vertical>
-        <NCard>
+        <Card>
           <NSpace justify='end' wrap={false}>
             <NInput
               allowInput={this.trim}
@@ -197,35 +195,33 @@ const BatchTaskInstance = defineComponent({
               clearable
             />
             <NButton size='small' type='primary' onClick={onSearch}>
-              {{
+              <NIcon>
-                icon: () => (
+                <SearchOutlined />
-                  <NIcon>
+              </NIcon>
-                    <SearchOutlined />
-                  </NIcon>
-                )
-              }}
             </NButton>
           </NSpace>
-        </NCard>
+        </Card>
-        <Card class={styles['table-card']}>
+        <Card title={t('project.task.stream_task')}>
-          <NDataTable
+          <NSpace vertical>
-            loading={loadingRef}
+            <NDataTable
-            columns={this.columns}
+              loading={loadingRef}
-            data={this.tableData}
+              columns={this.columns}
-            scrollX={this.tableWidth}
+              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={getTableData}
-              onUpdatePageSize={onUpdatePageSize}
             />
-          </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={getTableData}
+                onUpdatePageSize={onUpdatePageSize}
+              />
+            </NSpace>
+          </NSpace>
         </Card>
         <LogModal
           showModalRef={this.showModalRef}
@@ -235,7 +231,7 @@ const BatchTaskInstance = defineComponent({
           onConfirmModal={onConfirmModal}
           onRefreshLogs={refreshLogs}
         />
-      </>
+      </NSpace>
     )
   }
 })