Browse Source

[Fix][UI Next][V1.0.0-Alpha] fix queue display bug in tenant modal (#9064)

* fix queue always display first queue bug in tenant modal

* modify queueId init
3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
f5ef410d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
  2. 11
      dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts

3
dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx

@ -57,7 +57,7 @@ const TenantModal = defineComponent({
watch( watch(
() => props.showModalRef, () => props.showModalRef,
() => { () => {
props.showModalRef && getListData() props.showModalRef && getListData(props.statusRef)
} }
) )
@ -67,6 +67,7 @@ const TenantModal = defineComponent({
if (props.statusRef === 0) { if (props.statusRef === 0) {
variables.model.tenantCode = '' variables.model.tenantCode = ''
variables.model.description = '' variables.model.description = ''
variables.model.queueId = null
} else { } else {
variables.model.id = props.row.id variables.model.id = props.row.id
variables.model.tenantCode = props.row.tenantCode variables.model.tenantCode = props.row.tenantCode

11
dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts

@ -34,7 +34,7 @@ export function useModalData(
id: ref<number>(-1), id: ref<number>(-1),
tenantCode: ref(''), tenantCode: ref(''),
description: ref(''), description: ref(''),
queueId: ref<number>(-1), queueId: ref<number | null>(null),
generalOptions: [] generalOptions: []
}, },
saving: false, saving: false,
@ -48,7 +48,7 @@ export function useModalData(
} }
}) })
const getListData = () => { const getListData = (status: number) => {
const { state } = useAsyncState( const { state } = useAsyncState(
queryList().then((res: any) => { queryList().then((res: any) => {
variables.model.generalOptions = res.map((item: any) => { variables.model.generalOptions = res.map((item: any) => {
@ -57,7 +57,9 @@ export function useModalData(
value: item.id value: item.id
} }
}) })
variables.model.queueId = res[0].id if (status === 0) {
variables.model.queueId = res[0].id
}
}), }),
{} {}
) )
@ -84,13 +86,14 @@ export function useModalData(
(unused: any) => { (unused: any) => {
const data = { const data = {
tenantCode: variables.model.tenantCode, tenantCode: variables.model.tenantCode,
queueId: variables.model.queueId, queueId: variables.model.queueId as number,
description: variables.model.description description: variables.model.description
} }
createTenant(data).then( createTenant(data).then(
(unused: any) => { (unused: any) => {
variables.model.tenantCode = '' variables.model.tenantCode = ''
variables.model.description = '' variables.model.description = ''
variables.model.queueId = null
ctx.emit('confirmModal', props.showModalRef) ctx.emit('confirmModal', props.showModalRef)
}, },
(unused: any) => { (unused: any) => {

Loading…
Cancel
Save