From 5f3a195f6cc0beaef64f5144d04f2f69d2b0600d Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 24 Oct 2019 16:05:42 +0800
Subject: [PATCH] No tenant in the list of selected tenants the default is
 default, and the status not shown in the repair pa (#1092)

* Dependency workflow add dependency correction value

* Download workflow instance map width adjustment and change "desc" field to "description"

* The third-party library that builds the dependency is recommended to be placed in 'devDependencies'

* Tree chart and Gantt chart style modification

* The workflow instance can be deleted only when its status is success, failure, stop and pause.

* change desc to description

* Maximum width of tooltip is set to 500px, note the copyright number of login page

* Delete copyright number

* No tenant in the list of selected tenants the default is default, and the status not shown in the repair page

* repair
---
 .../src/js/conf/home/pages/dag/_source/dag.vue       |  6 +++---
 .../pages/dag/_source/udp/_source/selectTenant.vue   | 12 +++++++++++-
 .../pages/definition/pages/list/_source/list.vue     |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 97009bbef3..0c8cd2e861 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -196,9 +196,9 @@
             let state = res.processInstanceState
             let taskList = res.taskList
             let idArr = allNodesId()
-            const titleTpl = (item, description) => {
+            const titleTpl = (item, desc) => {
               let $item = _.filter(taskList, v => v.name === item.name)[0]
-              return `<div style="text-align: left">${i18n.$t('Name')}：${$item.name}</br>${i18n.$t('State')}：${description}</br>${i18n.$t('type')}：${$item.taskType}</br>${i18n.$t('host')}：${$item.host || '-'}</br>${i18n.$t('Retry Count')}：${$item.retryTimes}</br>${i18n.$t('Submit Time')}：${formatDate($item.submitTime)}</br>${i18n.$t('Start Time')}：${formatDate($item.startTime)}</br>${i18n.$t('End Time')}：${$item.endTime ? formatDate($item.endTime) : '-'}</br></div>`
+              return `<div style="text-align: left">${i18n.$t('Name')}：${$item.name}</br>${i18n.$t('State')}：${desc}</br>${i18n.$t('type')}：${$item.taskType}</br>${i18n.$t('host')}：${$item.host || '-'}</br>${i18n.$t('Retry Count')}：${$item.retryTimes}</br>${i18n.$t('Submit Time')}：${formatDate($item.submitTime)}</br>${i18n.$t('Start Time')}：${formatDate($item.startTime)}</br>${i18n.$t('End Time')}：${$item.endTime ? formatDate($item.endTime) : '-'}</br></div>`
             }
 
             // remove tip state dom
@@ -212,7 +212,7 @@
                   dom.attr('data-state-id', v1.stateId)
                   dom.attr('data-dependent-result', v1.dependentResult || '')
                   state.append(`<b class="iconfont ${v1.isSpin ? 'fa fa-spin' : ''}" style="color:${v1.color}" data-toggle="tooltip" data-html="true" data-container="body">${v1.icoUnicode}</b>`)
-                  state.find('b').attr('title', titleTpl(v2, v1.description))
+                  state.find('b').attr('title', titleTpl(v2, v1.desc))
                 }
               })
             })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
index 74f4d38e28..8a0f638b3d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
@@ -48,10 +48,20 @@
       prop: 'value',
       event: 'tenantSelectEvent'
     },
+    mounted() {
+      let result = this.itemList.some(item=>{
+        if(item.id == this.value) {
+          return true
+        }
+			})
+      if(!result) {
+        this.value = -1
+      }
+    },
     methods: {
       _onChange (o) {
         this.value = o.value
-        this.$emit('tenantSelectEvent', o.value)
+        // this.$emit('tenantSelectEvent', o.value)
       }
     },
     watch: {
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 7fd5ba61fc..0dfb32bd71 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
@@ -153,7 +153,7 @@
     methods: {
       ...mapActions('dag', ['editProcessState', 'getStartCheck', 'getReceiver', 'deleteDefinition', 'batchDeleteDefinition','exportDefinition']),
       _rtPublishStatus (code) {
-        return _.filter(publishStatus, v => v.code === code)[0].description
+        return _.filter(publishStatus, v => v.code === code)[0].desc
       },
       _treeView (item) {
         this.$router.push({ path: `/projects/definition/tree/${item.id}` })