mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-01 19:58:29 +08:00
Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected. (#1044)
* Delete third party import license * Resource authorization add file resource and UDF resource tab * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected. * revert
This commit is contained in:
parent
2cb635fe69
commit
9fd36c98fd
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
@ -3,15 +3,15 @@ name: CI
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
Compile-check:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Set up JDK 1.8
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
- name: check
|
||||
Compile-check:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Set up JDK 1.8
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
- name: check
|
||||
run: mvn -U -B clean package assembly:assembly -Dmaven.test.skip=true
|
||||
License-check:
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -226,7 +226,8 @@
|
||||
props: {
|
||||
item: item,
|
||||
receiversD: res.receivers,
|
||||
receiversCcD: res.receiversCc
|
||||
receiversCcD: res.receiversCc,
|
||||
type: 'timing'
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -193,7 +193,8 @@
|
||||
props: {
|
||||
item: Object,
|
||||
receiversD: Array,
|
||||
receiversCcD: Array
|
||||
receiversCcD: Array,
|
||||
type: String
|
||||
},
|
||||
methods: {
|
||||
_datepicker (val) {
|
||||
@ -311,6 +312,9 @@
|
||||
if(this.item.crontab !== null){
|
||||
this.crontab = this.item.crontab
|
||||
}
|
||||
if(this.type == 'timing') {
|
||||
this.crontab = '* * * * * ? *'
|
||||
}
|
||||
this.receivers = _.cloneDeep(this.receiversD)
|
||||
this.receiversCc = _.cloneDeep(this.receiversCcD)
|
||||
},
|
||||
|
@ -194,7 +194,7 @@
|
||||
this.radioSecond = 'cycleSecond'
|
||||
this.cycleStartVal = parseInt($cycle[0])
|
||||
this.cycleEndVal = parseInt($cycle[1])
|
||||
this.secondValue = `${this.cycleStartVal}/${this.cycleEndVal}`
|
||||
this.secondValue = `${this.cycleStartVal}-${this.cycleEndVal}`
|
||||
return
|
||||
}
|
||||
resolve()
|
||||
|
Loading…
Reference in New Issue
Block a user