github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Fix][UI Next][V1.0.0-Beta] Fix cannot select the workload scheduling time bug (#9762)

3.0.0/version-upgrade
Devosend 2 years ago committed by GitHub
parent
83d9ea3ccb
commit
e1c0b44857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dolphinscheduler-ui-next/src/components/crontab/index.module.scss
  2. 58
      dolphinscheduler-ui-next/src/components/crontab/modules/day.tsx
  3. 20
      dolphinscheduler-ui-next/src/components/crontab/modules/time.tsx

1
dolphinscheduler-ui-next/src/components/crontab/index.module.scss
Unescape View File

@ -24,6 +24,7 @@
vertical-align: middle; vertical-align: middle;
align-items: center; align-items: center;
width: 460px; width: 460px;
margin: 0 8px 0 8px;
> div { > div {
margin: 5px; margin: 5px;
} }

58
dolphinscheduler-ui-next/src/components/crontab/modules/day.tsx
Unescape View File

@ -470,12 +470,14 @@ export default defineComponent({
v-model:value={this.radioRef} v-model:value={this.radioRef}
onUpdateValue={this.updateRadioDay} onUpdateValue={this.updateRadioDay}
> >
<NRadio class={styles['crontab-list']} value={'everyDay'}> <div class={styles['crontab-list']}>
<NRadio value={'everyDay'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.every_day')}</div> <div>{t('crontab.every_day')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'WkintervalWeek'}> <div class={styles['crontab-list']}>
<NRadio value={'WkintervalWeek'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div class={styles['item-text']}>{t('crontab.every')}</div> <div class={styles['item-text']}>{t('crontab.every')}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -500,8 +502,9 @@ export default defineComponent({
</div> </div>
<div>{t('crontab.start')}</div> <div>{t('crontab.start')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'intervalDay'}> <div class={styles['crontab-list']}>
<NRadio value={'intervalDay'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.every')}</div> <div>{t('crontab.every')}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -525,8 +528,9 @@ export default defineComponent({
</div> </div>
<div>{t('crontab.day_start')}</div> <div>{t('crontab.day_start')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'WkspecificWeek'}> <div class={styles['crontab-list']}>
<NRadio value={'WkspecificWeek'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.specific_week')}</div> <div>{t('crontab.specific_week')}</div>
<div> <div>
@ -540,8 +544,9 @@ export default defineComponent({
/> />
</div> </div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'specificDay'}> <div class={styles['crontab-list']}>
<NRadio value={'specificDay'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.specific_day')}</div> <div>{t('crontab.specific_day')}</div>
<div> <div>
@ -555,18 +560,21 @@ export default defineComponent({
/> />
</div> </div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'monthLastDays'}> <div class={styles['crontab-list']}>
<NRadio value={'monthLastDays'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.last_day_of_month')}</div> <div>{t('crontab.last_day_of_month')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'monthLastWorkingDays'}> <div class={styles['crontab-list']}>
<NRadio value={'monthLastWorkingDays'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.last_work_day_of_month')}</div> <div>{t('crontab.last_work_day_of_month')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'monthLastWeeks'}> <div class={styles['crontab-list']}>
<NRadio value={'monthLastWeeks'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.last_of_month')}</div> <div>{t('crontab.last_of_month')}</div>
<div> <div>
@ -579,8 +587,9 @@ export default defineComponent({
/> />
</div> </div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'monthTailBefore'}> <div class={styles['crontab-list']}>
<NRadio value={'monthTailBefore'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div class={styles['number-input']}> <div class={styles['number-input']}>
<NInputNumber <NInputNumber
@ -593,11 +602,9 @@ export default defineComponent({
</div> </div>
<div>{t('crontab.before_end_of_month')}</div> <div>{t('crontab.before_end_of_month')}</div>
</div> </div>
</NRadio> </div>
<NRadio <div class={styles['crontab-list']}>
class={styles['crontab-list']} <NRadio value={'recentlyWorkingDaysMonth'} />
value={'recentlyWorkingDaysMonth'}
>
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.recent_business_day_to_month')}</div> <div>{t('crontab.recent_business_day_to_month')}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -612,8 +619,9 @@ export default defineComponent({
</div> </div>
<div style={{ width: '50px' }}>{t('crontab.one_day')}</div> <div style={{ width: '50px' }}>{t('crontab.one_day')}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'WkmonthNumWeeks'}> <div class={styles['crontab-list']}>
<NRadio value={'WkmonthNumWeeks'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t('crontab.in_this_months')}</div> <div>{t('crontab.in_this_months')}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -635,7 +643,7 @@ export default defineComponent({
/> />
</div> </div>
</div> </div>
</NRadio> </div>
</NRadioGroup> </NRadioGroup>
) )
} }

20
dolphinscheduler-ui-next/src/components/crontab/modules/time.tsx
Unescape View File

@ -220,12 +220,14 @@ export default defineComponent({
v-model:value={this.radioRef} v-model:value={this.radioRef}
onUpdateValue={this.updateRadioTime} onUpdateValue={this.updateRadioTime}
> >
<NRadio class={styles['crontab-list']} value={'everyTime'}> <div class={styles['crontab-list']}>
<NRadio value={'everyTime'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t(this.timeI18n!.everyTime)}</div> <div>{t(this.timeI18n!.everyTime)}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'intervalTime'}> <div class={styles['crontab-list']}>
<NRadio value={'intervalTime'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div class={styles['item-text']}>{t(this.timeI18n!.every)}</div> <div class={styles['item-text']}>{t(this.timeI18n!.every)}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -251,8 +253,9 @@ export default defineComponent({
</div> </div>
<div class={styles['item-text']}>{t(this.timeI18n!.timeStart)}</div> <div class={styles['item-text']}>{t(this.timeI18n!.timeStart)}</div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'specificTime'}> <div class={styles['crontab-list']}>
<NRadio value={'specificTime'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t(this.timeI18n!.specificTime)}</div> <div>{t(this.timeI18n!.specificTime)}</div>
<div class={styles['select-input']}> <div class={styles['select-input']}>
@ -265,8 +268,9 @@ export default defineComponent({
/> />
</div> </div>
</div> </div>
</NRadio> </div>
<NRadio class={styles['crontab-list']} value={'cycleTime'}> <div class={styles['crontab-list']}>
<NRadio value={'cycleTime'} />
<div class={styles['crontab-list-item']}> <div class={styles['crontab-list-item']}>
<div>{t(this.timeI18n!.cycleFrom)}</div> <div>{t(this.timeI18n!.cycleFrom)}</div>
<div class={styles['number-input']}> <div class={styles['number-input']}>
@ -290,7 +294,7 @@ export default defineComponent({
</div> </div>
<div>{t(this.timeI18n!.time)}</div> <div>{t(this.timeI18n!.time)}</div>
</div> </div>
</NRadio> </div>
</NRadioGroup> </NRadioGroup>
) )
} }

Write Preview
Loading…
Cancel
Save