diff --git a/dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts b/dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts index 611d52d14a..c2d8ed1243 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/instance/use-table.ts @@ -30,7 +30,6 @@ import { import { execute } from '@/service/modules/executors' import TableAction from './components/table-action' import { renderTableTime, runningType } from '@/common/common' -import styles from './index.module.scss' import { renderStateCell } from '../../task/instance/use-table' import { COLUMN_WIDTH_CONFIG, diff --git a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.module.scss b/dolphinscheduler-ui/src/views/resource/task-group/queue/index.module.scss deleted file mode 100644 index 202f1e2d7e..0000000000 --- a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.module.scss +++ /dev/null @@ -1,44 +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. - */ - -.toolbar { - display: flex; - justify-content: flex-end; - align-items: center; - padding: 0 0 0 0; -} - -.table-card { - margin-top: 2px; - - .table-action { - display: flex; - justify-content: center; - align-items: center; - button { - margin: 0 2px 0 0; - } - div { - margin: 0 2px 0 0; - } - } - .pagination { - margin-top: 20px; - display: flex; - justify-content: center; - } -} diff --git a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx b/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx index 622a0f8e7b..5891a446f1 100644 --- a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx +++ b/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx @@ -15,27 +15,27 @@ * limitations under the License. */ -import { ref, defineComponent, toRefs, reactive, onMounted, Ref, getCurrentInstance } from 'vue' +import { ref, defineComponent, toRefs, reactive, onMounted, getCurrentInstance } from 'vue' import { NButton, NIcon, NInput, - NCard, NDataTable, NPagination, NSelect, NSpace } from 'naive-ui' -import Card from '@/components/card' import { SearchOutlined } from '@vicons/antd' import { useI18n } from 'vue-i18n' -import styles from './index.module.scss' import { useTable } from './use-table' -import FormModal from '@/views/resource/task-group/queue/components/form-modal' import { queryTaskGroupListPaging } from '@/service/modules/task-group' import { TaskGroupRes } from '@/service/modules/task-group/types' import { SelectMixedOption } from 'naive-ui/lib/select/src/interface' -import { Router, useRouter } from 'vue-router' +import { useRouter } from 'vue-router' +import FormModal from '@/views/resource/task-group/queue/components/form-modal' +import Card from '@/components/card' +import type { Ref } from 'vue' +import type { Router } from 'vue-router' const taskGroupQueue = defineComponent({ name: 'taskGroupQueue', @@ -158,45 +158,40 @@ const taskGroupQueue = defineComponent({ const { columns } = useTable(updatePriority, resetTableData) return ( -
- -
- - - - - - - - - - -
-
- -
+ + + + + + + + + + + + + + + -
+ -
-
+ +
{showModalRef && ( )} -
+ ) } })