File tree Expand file tree Collapse file tree
dolphinscheduler-ui/src/views/projects/task/components/node Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ import type {
3131 IJsonItem ,
3232 IDependpendItem ,
3333 IDependTask ,
34- ITaskState
34+ ITaskState ,
35+ IDateType
3536} from '../types'
3637
3738export function useDependent ( model : { [ field : string ] : any } ) : IJsonItem [ ] {
@@ -172,7 +173,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
172173 label : t ( 'project.node.last_month_end' )
173174 }
174175 ]
175- }
176+ } as { [ key in IDateType ] : { value : string ; label : string } [ ] }
176177
177178 const getProjectList = async ( ) => {
178179 const result = await queryAllProjectList ( )
@@ -338,8 +339,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
338339 rule : {
339340 required : true ,
340341 trigger : [ 'input' , 'blur' ] ,
341- validator ( validate : any , value : string ) {
342- if ( ! value ) {
342+ validator ( validate : any , value : number ) {
343+ if ( ! value && value !== 0 ) {
343344 return Error ( t ( 'project.node.task_name_tips' ) )
344345 }
345346 }
@@ -351,9 +352,10 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
351352 span : 10 ,
352353 name : t ( 'project.node.cycle_time' ) ,
353354 props : {
354- onUpdateValue : ( value : 'month' ) => {
355+ onUpdateValue : ( value : IDateType ) => {
355356 model . dependTaskList [ i ] . dependItemList [ j ] . dateOptions =
356357 DATE_LSIT [ value ]
358+ model . dependTaskList [ i ] . dependItemList [ j ] . dateValue = null
357359 }
358360 } ,
359361 options : CYCLE_LIST ,
Original file line number Diff line number Diff line change @@ -37,6 +37,7 @@ type SourceType = 'MYSQL' | 'HDFS' | 'HIVE'
3737type ModelType = 'import' | 'export'
3838type RelationType = 'AND' | 'OR'
3939type ITaskType = TaskType
40+ type IDateType = 'hour' | 'day' | 'week' | 'month'
4041
4142interface IOption {
4243 label : string
@@ -383,5 +384,6 @@ export {
383384 IJsonItem ,
384385 FormRules ,
385386 IJsonItemParams ,
386- IResponseJsonItem
387+ IResponseJsonItem ,
388+ IDateType
387389}
You can’t perform that action at this time.
0 commit comments