Browse Source

[Fix-8690][UI Next][V1.0.0-Alpha] Fix startup execType bug (#8734)

3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
e34f6fc807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 85
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
  2. 2
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts

85
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx

@ -282,56 +282,59 @@ export default defineComponent({
>
<NCheckbox
checkedValue={'COMPLEMENT_DATA'}
uncheckedValue={undefined}
uncheckedValue={'START_PROCESS'}
v-model:checked={this.startForm.execType}
>
{t('project.workflow.whether_complement_data')}
</NCheckbox>
</NFormItem>
{this.startForm.execType && (
<NSpace>
<NFormItem
label={t('project.workflow.mode_of_execution')}
path='runMode'
>
<NRadioGroup v-model:value={this.startForm.runMode}>
<NSpace>
<NRadio value={'RUN_MODE_SERIAL'}>
{t('project.workflow.serial_execution')}
</NRadio>
<NRadio value={'RUN_MODE_PARALLEL'}>
{t('project.workflow.parallel_execution')}
</NRadio>
</NSpace>
</NRadioGroup>
</NFormItem>
{this.startForm.runMode === 'RUN_MODE_PARALLEL' && (
{this.startForm.execType &&
this.startForm.execType !== 'START_PROCESS' && (
<NSpace>
<NFormItem
label={t('project.workflow.mode_of_execution')}
path='runMode'
>
<NRadioGroup v-model:value={this.startForm.runMode}>
<NSpace>
<NRadio value={'RUN_MODE_SERIAL'}>
{t('project.workflow.serial_execution')}
</NRadio>
<NRadio value={'RUN_MODE_PARALLEL'}>
{t('project.workflow.parallel_execution')}
</NRadio>
</NSpace>
</NRadioGroup>
</NFormItem>
{this.startForm.runMode === 'RUN_MODE_PARALLEL' && (
<NFormItem
label={t('project.workflow.parallelism')}
path='expectedParallelismNumber'
>
<NCheckbox v-model:checked={this.parallelismRef}>
{t('project.workflow.custom_parallelism')}
</NCheckbox>
<NInput
disabled={!this.parallelismRef}
placeholder={t(
'project.workflow.please_enter_parallelism'
)}
v-model:value={this.startForm.expectedParallelismNumber}
/>
</NFormItem>
)}
<NFormItem
label={t('project.workflow.parallelism')}
path='expectedParallelismNumber'
label={t('project.workflow.schedule_date')}
path='startEndTime'
>
<NCheckbox v-model:checked={this.parallelismRef}>
{t('project.workflow.custom_parallelism')}
</NCheckbox>
<NInput
disabled={!this.parallelismRef}
placeholder={t('project.workflow.please_enter_parallelism')}
v-model:value={this.startForm.expectedParallelismNumber}
<NDatePicker
type='datetimerange'
clearable
v-model:value={this.startForm.startEndTime}
/>
</NFormItem>
)}
<NFormItem
label={t('project.workflow.schedule_date')}
path='startEndTime'
>
<NDatePicker
type='datetimerange'
clearable
v-model:value={this.startForm.startEndTime}
/>
</NFormItem>
</NSpace>
)}
</NSpace>
)}
<NFormItem
label={t('project.workflow.startup_parameter')}
path='startup_parameter'

2
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts

@ -54,7 +54,7 @@ export const useForm = () => {
failureStrategy: 'CONTINUE',
warningType: 'NONE',
warningGroupId: null,
execType: '',
execType: 'START_PROCESS',
startNodeList: '',
taskDependType: 'TASK_POST',
runMode: 'RUN_MODE_SERIAL',

Loading…
Cancel
Save