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/11 06:08:23 UTC
[dolphinscheduler] branch dev updated: [Refactor][UI] Refactor workflow definition timing using NSpace component. (#11415)
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 16134014f8 [Refactor][UI] Refactor workflow definition timing using NSpace component. (#11415)
16134014f8 is described below
commit 16134014f83ac5196ded78885f1405b2e694ef5b
Author: songjianet <17...@qq.com>
AuthorDate: Thu Aug 11 14:08:16 2022 +0800
[Refactor][UI] Refactor workflow definition timing using NSpace component. (#11415)
* [Refactor][UI] Refactor workflow definition timing using NSpace component.
* [Refactor][UI] Refactor workflow definition timing using NSpace component.
---
.../projects/workflow/definition/index.module.scss | 51 -----------------
.../projects/workflow/definition/timing/index.tsx | 66 +++++++++++-----------
2 files changed, 32 insertions(+), 85 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/index.module.scss b/dolphinscheduler-ui/src/views/projects/workflow/definition/index.module.scss
index efae131f41..251e88f29e 100644
--- a/dolphinscheduler-ui/src/views/projects/workflow/definition/index.module.scss
+++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/index.module.scss
@@ -15,29 +15,6 @@
* limitations under the License.
*/
-.content {
- width: 100%;
-
- .card {
- margin-bottom: 8px;
- }
-
- .header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin: 10px 0;
- .right {
- > .search {
- .list {
- float: right;
- margin: 3px 0 3px 4px;
- }
- }
- }
- }
-}
-
.table {
table {
width: 100%;
@@ -79,37 +56,9 @@
}
}
-.batch-button {
- position: absolute;
- bottom: 10px;
- left: 10px;
- > div {
- margin-right: 5px;
- }
-}
-
.formItem {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
-
-.workflow-name {
- :global {
- div:first-child {
- width: calc(100% - 32px);
-
- .n-button,
- .n-button__content {
- width: 100%;
- span {
- padding-bottom: 1px;
- }
- }
- }
- }
-}
-.width-100 {
- width: 100%;
-}
diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/timing/index.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/timing/index.tsx
index f2dc456e9d..3ce26e1bba 100644
--- a/dolphinscheduler-ui/src/views/projects/workflow/definition/timing/index.tsx
+++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/timing/index.tsx
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-import Card from '@/components/card'
import { ArrowLeftOutlined } from '@vicons/antd'
-import { NButton, NDataTable, NIcon, NPagination } from 'naive-ui'
+import { NButton, NDataTable, NIcon, NPagination, NSpace } from 'naive-ui'
import { defineComponent, onMounted, toRefs, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
-import type { Router } from 'vue-router'
import { useTable } from './use-table'
+import Card from '@/components/card'
import TimingModal from '../components/timing-modal'
-import styles from '../index.module.scss'
+import type { Router } from 'vue-router'
export default defineComponent({
name: 'WorkflowDefinitionTiming',
@@ -76,38 +75,37 @@ export default defineComponent({
const { loadingRef } = this
return (
- <div class={styles.content}>
- <Card class={styles.card}>
- <div class={styles.header}>
- <NButton type='primary' onClick={() => router.go(-1)}>
- <NIcon>
- <ArrowLeftOutlined />
- </NIcon>
- </NButton>
- </div>
+ <NSpace vertical>
+ <Card>
+ <NButton type='primary' size='small' onClick={() => router.go(-1)}>
+ <NIcon>
+ <ArrowLeftOutlined />
+ </NIcon>
+ </NButton>
</Card>
<Card title={t('project.workflow.cron_manage')}>
- <NDataTable
- loading={loadingRef}
- columns={this.columns}
- data={this.tableData}
- striped
- size={'small'}
- class={styles.table}
- 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={this.requestData}
- onUpdatePageSize={this.handleChangePageSize}
+ <NSpace vertical>
+ <NDataTable
+ loading={loadingRef}
+ columns={this.columns}
+ data={this.tableData}
+ striped
+ size={'small'}
+ 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={this.requestData}
+ onUpdatePageSize={this.handleChangePageSize}
+ />
+ </NSpace>
+ </NSpace>
</Card>
<TimingModal
type={'update'}
@@ -115,7 +113,7 @@ export default defineComponent({
v-model:show={this.showRef}
onUpdateList={this.handleUpdateList}
/>
- </div>
+ </NSpace>
)
}
})