seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fix][UI][V1.0.0-Beta]Fix data not update bug for workflow version switch (#9642)

dependabot/maven/org.springframework-spring-core-5.3.19
Devosend 2022-04-21 15:28:48 +08:00 committed by GitHub
parent 337696e258
commit 303ee1bf15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 127 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts
View File

@ -35,118 +35,8 @@ export function useTable(
const { t } = useI18n()
const router: Router = useRouter()
const columns: TableColumns<any> = [
{
title: '#',
key: 'id',
width: 50,
render: (_row, index) => index + 1
},
{
title: t('project.workflow.version'),
key: 'version',
render: (_row) => {
if (_row.version === variables.row.version) {
return h(
NTag,
{ type: 'success', size: 'small' },
{
default: () =>
`V${_row.version} ${t('project.workflow.current_version')}`
}
)
} else {
return `V${_row.version}`
}
}
},
{
title: t('project.workflow.description'),
key: 'description'
},
{
title: t('project.workflow.create_time'),
key: 'operateTime'
},
{
title: t('project.workflow.operation'),
key: 'operation',
className: styles.operation,
render: (_row) => {
return h(NSpace, null, {
default: () => [
h(
NPopconfirm,
{
onPositiveClick: () => {
handleSwitchVersion(_row.version)
}
},
{
trigger: () =>
h(
NTooltip,
{},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'info',
size: 'tiny',
disabled: _row.version === variables.row.version
},
{
icon: () => h(ExclamationCircleOutlined)
}
),
default: () => t('project.workflow.switch_version')
}
),
default: () => t('project.workflow.confirm_switch_version')
}
),
h(
NPopconfirm,
{
onPositiveClick: () => {
handleDeleteVersion(_row.version)
}
},
{
trigger: () =>
h(
NTooltip,
{},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'error',
size: 'tiny',
disabled: _row.version === variables.row.version
},
{
icon: () => h(DeleteOutlined)
}
),
default: () => t('project.workflow.delete')
}
),
default: () => t('project.workflow.delete_confirm')
}
)
]
})
}
}
]
const variables = reactive({
columns,
columns: [],
row: {} as any,
tableData: [],
page: ref(1),
@ -156,6 +46,118 @@ export function useTable(
loadingRef: ref(false)
})
const createColumns = (variables: any) => {
variables.columns = [
{
title: '#',
key: 'id',
width: 50,
render: (_row, index) => index + 1
},
{
title: t('project.workflow.version'),
key: 'version',
render: (_row) => {
if (_row.version === variables.row.version) {
return h(
NTag,
{ type: 'success', size: 'small' },
{
default: () =>
`V${_row.version} ${t('project.workflow.current_version')}`
}
)
} else {
return `V${_row.version}`
}
}
},
{
title: t('project.workflow.description'),
key: 'description'
},
{
title: t('project.workflow.create_time'),
key: 'operateTime'
},
{
title: t('project.workflow.operation'),
key: 'operation',
className: styles.operation,
render: (_row) => {
return h(NSpace, null, {
default: () => [
h(
NPopconfirm,
{
onPositiveClick: () => {
handleSwitchVersion(_row.version)
}
},
{
trigger: () =>
h(
NTooltip,
{},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'info',
size: 'tiny',
disabled: _row.version === variables.row.version
},
{
icon: () => h(ExclamationCircleOutlined)
}
),
default: () => t('project.workflow.switch_version')
}
),
default: () => t('project.workflow.confirm_switch_version')
}
),
h(
NPopconfirm,
{
onPositiveClick: () => {
handleDeleteVersion(_row.version)
}
},
{
trigger: () =>
h(
NTooltip,
{},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'error',
size: 'tiny',
disabled: _row.version === variables.row.version
},
{
icon: () => h(DeleteOutlined)
}
),
default: () => t('project.workflow.delete')
}
),
default: () => t('project.workflow.delete_confirm')
}
)
]
})
}
}
] as TableColumns<any>
}
const getTableData = (row: any) => {
if (variables.loadingRef) return
variables.loadingRef = true
@ -178,9 +180,9 @@ export function useTable(
const handleSwitchVersion = (version: number) => {
switchVersion(variables.projectCode, variables.row.code, version).then(
() => {
variables.row.version = version
window.$message.success(t('project.workflow.success'))
ctx.emit('updateList')
getTableData(variables.row)
}
)
}
@ -190,6 +192,9 @@ export function useTable(
() => {
window.$message.success(t('project.workflow.success'))
ctx.emit('updateList')
if (variables.tableData.length === 1 && variables.page > 1) {
variables.page -= 1
}
getTableData(variables.row)
}
)
@ -197,6 +202,7 @@ export function useTable(
return {
variables,
createColumns,
getTableData
}
}

11
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/version-modal.tsx
View File

@ -41,7 +41,7 @@ export default defineComponent({
props,
emits: ['update:show', 'update:row', 'updateList'],
setup(props, ctx) {
const { variables, getTableData } = useTable(ctx)
const { variables, createColumns, getTableData } = useTable(ctx)
const { importState } = useForm()
const { handleImportDefinition } = useModal(importState, ctx)
@ -66,9 +66,16 @@ export default defineComponent({
watch(
() => props.show,
() => requestData()
() => {
createColumns(variables)
requestData()
}
)
watch(useI18n().locale, () => {
createColumns(variables)
})
return {
hideModal,
handleImport,