Browse Source

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
pull/2/head
break60 5 years ago committed by qiaozhanwei
parent
commit
9fd36c98fd
  1. 18
      .github/workflows/ci.yml
  2. 3
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  3. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
  4. 2
      dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue

18
.github/workflows/ci.yml

@ -3,15 +3,15 @@ name: CI
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
Compile-check: Compile-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Set up JDK 1.8 - name: Set up JDK 1.8
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: check - name: check
run: mvn -U -B clean package assembly:assembly -Dmaven.test.skip=true run: mvn -U -B clean package assembly:assembly -Dmaven.test.skip=true
License-check: License-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest

3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@ -226,7 +226,8 @@
props: { props: {
item: item, item: item,
receiversD: res.receivers, receiversD: res.receivers,
receiversCcD: res.receiversCc receiversCcD: res.receiversCc,
type: 'timing'
} }
}) })
} }

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@ -193,7 +193,8 @@
props: { props: {
item: Object, item: Object,
receiversD: Array, receiversD: Array,
receiversCcD: Array receiversCcD: Array,
type: String
}, },
methods: { methods: {
_datepicker (val) { _datepicker (val) {
@ -311,6 +312,9 @@
if(this.item.crontab !== null){ if(this.item.crontab !== null){
this.crontab = this.item.crontab this.crontab = this.item.crontab
} }
if(this.type == 'timing') {
this.crontab = '* * * * * ? *'
}
this.receivers = _.cloneDeep(this.receiversD) this.receivers = _.cloneDeep(this.receiversD)
this.receiversCc = _.cloneDeep(this.receiversCcD) this.receiversCc = _.cloneDeep(this.receiversCcD)
}, },

2
dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue

@ -194,7 +194,7 @@
this.radioSecond = 'cycleSecond' this.radioSecond = 'cycleSecond'
this.cycleStartVal = parseInt($cycle[0]) this.cycleStartVal = parseInt($cycle[0])
this.cycleEndVal = parseInt($cycle[1]) this.cycleEndVal = parseInt($cycle[1])
this.secondValue = `${this.cycleStartVal}/${this.cycleEndVal}` this.secondValue = `${this.cycleStartVal}-${this.cycleEndVal}`
return return
} }
resolve() resolve()

Loading…
Cancel
Save