dd branch flow node verification

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

@@ -135,7 +135,7 @@
         width: 36px;
         height: 36px;
         float: left;
-        margin-bottom: 11px;
+        margin-bottom: 8px;
         border-radius: 3px;
         .disabled {
           .icos {

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -326,45 +326,62 @@
        * Storage interface
        */
       _save (sourceType) {
-        return new Promise((resolve, reject) => {
+        if(this._verifConditions()) {
-          this.spinnerLoading = true
+          return new Promise((resolve, reject) => {
-          // Storage store
+            this.spinnerLoading = true
-          Dag.saveStore().then(res => {
+            // Storage store
-            if (this.urlParam.id) {
+            Dag.saveStore().then(res => {
-              /**
+              if (this.urlParam.id) {
-               * Edit
+                /**
-               * @param saveInstanceEditDAGChart => Process instance editing
+                 * Edit
-               * @param saveEditDAGChart => Process definition editing
+                 * @param saveInstanceEditDAGChart => Process instance editing
-               */
+                 * @param saveEditDAGChart => Process definition editing
-              this[this.type === 'instance' ? 'updateInstance' : 'updateDefinition'](this.urlParam.id).then(res => {
+                 */
-                this.$message.success(res.msg)
+                this[this.type === 'instance' ? 'updateInstance' : 'updateDefinition'](this.urlParam.id).then(res => {
-                this.spinnerLoading = false
+                  this.$message.success(res.msg)
-                resolve()
+                  this.spinnerLoading = false
-              }).catch(e => {
+                  resolve()
-                this.$message.error(e.msg || '')
+                }).catch(e => {
-                this.spinnerLoading = false
+                  this.$message.error(e.msg || '')
-                reject(e)
+                  this.spinnerLoading = false
-              })
+                  reject(e)
-            } else {
+                })
-              // New
+              } else {
-              this.saveDAGchart().then(res => {
+                // New
-                this.$message.success(res.msg)
+                this.saveDAGchart().then(res => {
-                this.spinnerLoading = false
+                  this.$message.success(res.msg)
-                // source @/conf/home/pages/dag/_source/editAffirmModel/index.js
+                  this.spinnerLoading = false
-                if (sourceType !== 'affirm') {
+                  // source @/conf/home/pages/dag/_source/editAffirmModel/index.js
-                  // Jump process definition
+                  if (sourceType !== 'affirm') {
-                  this.$router.push({ name: 'projects-definition-list' })
+                    // Jump process definition
-                }
+                    this.$router.push({ name: 'projects-definition-list' })
-                resolve()
+                  }
-              }).catch(e => {
+                  resolve()
-                this.$message.error(e.msg || '')
+                }).catch(e => {
-                this.setName('')
+                  this.$message.error(e.msg || '')
-                this.spinnerLoading = false
+                  this.setName('')
-                reject(e)
+                  this.spinnerLoading = false
-              })
+                  reject(e)
-            }
+                })
+              }
+            })
           })
+        }
+      },
+      _verifConditions () {
+        let tasks = this.$store.state.dag.tasks
+        let bool = true
+        tasks.map(v=>{
+          if(v.type == 'CONDITIONS' && (v.conditionResult.successNode[0] =='' || v.conditionResult.successNode[0] == null || v.conditionResult.failedNode[0] =='' || v.conditionResult.failedNode[0] == null)) {
+            bool = false
+            return false
+          }
         })
+        if(!bool) {
+          this.$message.warning(`${i18n.$t('Successful branch flow and failed branch flow are required')}`)
+          return false
+        }
+        return true
       },
       /**
        * Global parameter

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@@ -470,7 +470,7 @@
           this.$message.warning(`${i18n.$t('Please enter name (required)')}`)
           return false
         }
-        if (this.successBranch !='' && this.successBranch == this.failedBranch) {
+        if (this.successBranch !='' && this.successBranch !=null && this.successBranch == this.failedBranch) {
           this.$message.warning(`${i18n.$t('Cannot select the same node for successful branch flow and failed branch flow')}`)
           return false
         }

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue

@@ -128,10 +128,6 @@
             this.store.dispatch('dag/getProcessTasksList', { processDefinitionId: ids }).then(res => {
               resolve(['ALL'].concat(_.map(res, v => v.name)))
             })
-          } else {
-            this.store.dispatch('dag/getTaskListDefIdAll', { processDefinitionIdList: ids }).then(res => {
-              resolve(res)
-            })
           }
         })
       },

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -568,5 +568,6 @@ export default {
   'All Columns': 'All Columns',
   'Some Columns': 'Some Columns',
   'Branch flow': 'Branch flow',
-  'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow'
+  'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
+  'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required'
 }

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -568,5 +568,6 @@ export default {
   'All Columns': '全表导入',
   'Some Columns': '选择列',
   'Branch flow': '分支流转',
-  'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点'
+  'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
+  'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填',
 }