From 9fd36c98fd558ff75198534fc08d2b4d11e541a5 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 17 Oct 2019 15:26:36 +0800
Subject: [PATCH] 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
---
 .github/workflows/ci.yml                       | 18 +++++++++---------
 .../definition/pages/list/_source/list.vue     |  3 ++-
 .../definition/pages/list/_source/timing.vue   |  6 +++++-
 .../crontab/source/_times/second.vue           |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c627b2b9fe..231235ef99 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index a84a2aedcf..3f514a2eb9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -226,7 +226,8 @@
                 props: {
                   item: item,
                   receiversD: res.receivers,
-                  receiversCcD: res.receiversCc
+                  receiversCcD: res.receiversCc,
+                  type: 'timing'
                 }
               })
             }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 3722e678b3..8355a452f4 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -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)
     },
diff --git a/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue b/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue
index d710cb8640..e852c48082 100755
--- a/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue
+++ b/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue
@@ -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()