From a12283aa23df86081291594dfa72265323380326 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 18 Aug 2020 14:09:03 +0800
Subject: [PATCH] [ui]Resource delete OK button to increase loading, change the
 number of homepage display cursor

---
 .../conf/home/pages/dag/_source/formModel/log.vue   |  1 +
 .../pages/index/_source/processStateCount.vue       |  9 +++++++--
 .../pages/index/_source/taskCtatusCount.vue         | 13 +++++++++----
 .../resource/pages/file/pages/list/_source/list.vue | 10 +++++++---
 .../pages/file/pages/subdirectory/_source/list.vue  | 10 +++++++---
 .../pages/udf/pages/function/_source/list.vue       | 10 +++++++---
 .../pages/udf/pages/resource/_source/list.vue       | 10 +++++++---
 .../udf/pages/subUdfDirectory/_source/list.vue      | 10 +++++++---
 8 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
index 39a6989f42..838f429bd3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
@@ -304,6 +304,7 @@
             font-size: 12px;
             margin-left: 10px;
             em {
+              text-decoration: none !important;
               vertical-align: middle;
             }
           }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
index d121034932..84665fbe9d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
@@ -31,7 +31,10 @@
               </tr>
               <tr v-for="(item,$index) in processStateList" :key="$index">
                 <td><span>{{$index+1}}</span></td>
-                <td><span><a href="javascript:" @click="searchParams.projectId && _goProcess(item.key)" :class="searchParams.projectId ?'links':''">{{item.value}}</a></span></td>
+                <td>
+                  <a v-if="currentName === 'home'" style="cursor: default">{{item.value}}</a>
+                  <span v-else><a href="javascript:" @click="searchParams.projectId && _goProcess(item.key)">{{item.value}}</a></span>
+                </td>
                 <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>
               </tr>
             </table>
@@ -57,7 +60,8 @@
       return {
         isSpin: true,
         msg: '',
-        processStateList: []
+        processStateList: [],
+        currentName: ''
       }
     },
     props: {
@@ -113,6 +117,7 @@
     beforeCreate () {
     },
     created () {
+      this.currentName = this.$router.currentRoute.name
     },
     beforeMount () {
     },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
index 3e56c344f7..f82097ab8e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
@@ -32,8 +32,9 @@
               <tr v-for="(item,$index) in taskCtatusList" :key="$index">
                 <td><span>{{$index+1}}</span></td>
                 <td>
-                  <span>
-                    <a href="javascript:" @click="searchParams.projectId && _goTask(item.key)" :class="searchParams.projectId ?'links':''">{{item.value}}</a>
+                  <a v-if="currentName === 'home'" style="cursor: default">{{item.value}}</a>
+                  <span v-else>
+                    <a href="javascript:" @click="searchParams.projectId && _goTask(item.key)">{{item.value}}</a>
                   </span>
                 </td>
                 <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>
@@ -62,7 +63,8 @@
       return {
         isSpin: true,
         msg: '',
-        taskCtatusList: []
+        taskCtatusList: [],
+        currentName: ''
       }
     },
     props: {
@@ -120,6 +122,7 @@
     beforeCreate () {
     },
     created () {
+      this.currentName = this.$router.currentRoute.name
     },
     beforeMount () {
     },
@@ -140,6 +143,8 @@
 
 <style lang="scss" rel="stylesheet/scss">
   .task-ctatus-count-model {
-
+    .links {
+      cursor: Default;
+    }
   }
 </style>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index 4f256f8563..ce4d2b7dac 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -115,11 +115,11 @@
             <x-poptip
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
-                    width="90">
+                    width="190">
               <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
                 <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" :loading="spinnerLoading" @click="_delete(item,$index)">{{spinnerLoading ? 'Loading' : $t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -151,7 +151,8 @@
     name: 'file-manage-list',
     data () {
       return {
-        list: []
+        list: [],
+        spinnerLoading: false
       }
     },
     props: {
@@ -189,15 +190,18 @@
         this.$refs[`poptip-${i}`][0].doClose()
       },
       _delete (item, i) {
+        this.spinnerLoading = true
         this.deleteResource({
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$emit('on-update')
           this.$message.success(res.msg)
+          this.spinnerLoading = false
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$message.error(e.msg || '')
+          this.spinnerLoading = false
         })
       },
       _rename (item, i) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
index 5813a58618..0c22b429f1 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
@@ -115,11 +115,11 @@
             <x-poptip
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
-                    width="90">
+                    width="190">
               <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
                 <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" :loading="spinnerLoading" @click="_delete(item,$index)">{{spinnerLoading ? 'Loading' : $t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -152,7 +152,8 @@
     name: 'file-manage-list',
     data () {
       return {
-        list: []
+        list: [],
+        spinnerLoading: false
       }
     },
     props: {
@@ -190,15 +191,18 @@
         this.$refs[`poptip-${i}`][0].doClose()
       },
       _delete (item, i) {
+        this.spinnerLoading = true
         this.deleteResource({
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$emit('on-update')
           this.$message.success(res.msg)
+          this.spinnerLoading = false
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$message.error(e.msg || '')
+          this.spinnerLoading = false
         })
       },
       _rename (item, i) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index d77f55722e..8320a17516 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -94,11 +94,11 @@ v-ps<template>
             <x-poptip
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
-                    width="90">
+                    width="190">
               <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
                 <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" :loading="spinnerLoading" @click="_delete(item,$index)">{{spinnerLoading ? 'Loading' : $t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -125,7 +125,8 @@ v-ps<template>
     name: 'udf-manage-list',
     data () {
       return {
-        list: []
+        list: [],
+        spinnerLoading: false
       }
     },
     props: {
@@ -139,15 +140,18 @@ v-ps<template>
         this.$refs[`poptip-${i}`][0].doClose()
       },
       _delete (item, i) {
+        this.spinnerLoading = true
         this.deleteUdf({
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$emit('on-update')
           this.$message.success(res.msg)
+          this.spinnerLoading = false
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$message.error(e.msg || '')
+          this.spinnerLoading = false
         })
       },
       _edit (item) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index 0372403c95..f2244b634d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -108,11 +108,11 @@
             <x-poptip
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
-                    width="90">
+                    width="190">
               <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
                 <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" :loading="spinnerLoading" @click="_delete(item,$index)">{{spinnerLoading ? 'Loading' : $t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -143,7 +143,8 @@
     name: 'udf-manage-list',
     data () {
       return {
-        list: []
+        list: [],
+        spinnerLoading: false
       }
     },
     props: {
@@ -178,15 +179,18 @@
         this.$refs[`poptip-${i}`][0].doClose()
       },
       _delete (item, i) {
+        this.spinnerLoading = true
         this.deleteResource({
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$emit('on-update')
           this.$message.success(res.msg)
+          this.spinnerLoading = false
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$message.error(e.msg || '')
+          this.spinnerLoading = false
         })
       },
       _rename (item, i) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
index 610eb1dbd8..f41dcc47ce 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
@@ -108,11 +108,11 @@
             <x-poptip
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
-                    width="90">
+                    width="190">
               <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
                 <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" :loading="spinnerLoading" @click="_delete(item,$index)">{{spinnerLoading ? 'Loading' : $t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -144,7 +144,8 @@
     name: 'udf-manage-list',
     data () {
       return {
-        list: []
+        list: [],
+        spinnerLoading: false
       }
     },
     props: {
@@ -179,15 +180,18 @@
         this.$refs[`poptip-${i}`][0].doClose()
       },
       _delete (item, i) {
+        this.spinnerLoading = true
         this.deleteResource({
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$emit('on-update')
           this.$message.success(res.msg)
+          this.spinnerLoading = false
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
           this.$message.error(e.msg || '')
+          this.spinnerLoading = false
         })
       },
       _rename (item, i) {