From 74a5506b9a65e5adf34a06d4999f7f8cb0082867 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Wed, 8 Jan 2020 19:35:27 +0800
Subject: [PATCH] Fix delete operation, no query interface request is made on
 the list page #1768 (#1777)

* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications

* jest unit test demo

* jest unit test demo

* Fix delete operation, no query interface request is made on the list page

* Fix delete operation, no query interface request is made on the list page
---
 .../home/pages/datasource/pages/list/_source/list.vue |  2 +-
 .../conf/home/pages/datasource/pages/list/index.vue   | 11 +++++++----
 .../home/pages/monitor/pages/servers/servers.scss     |  2 +-
 .../projects/pages/_source/taskRecordList/index.vue   |  4 ++--
 .../projects/pages/definition/pages/list/index.vue    |  4 ++--
 .../projects/pages/instance/pages/list/index.vue      |  4 ++--
 .../home/pages/projects/pages/list/_source/list.vue   |  5 +++--
 .../js/conf/home/pages/projects/pages/list/index.vue  |  4 ++--
 .../resource/pages/file/pages/list/_source/list.vue   |  2 +-
 .../pages/resource/pages/file/pages/list/index.vue    |  9 ++++++---
 .../pages/udf/pages/function/_source/list.vue         |  2 +-
 .../pages/resource/pages/udf/pages/function/index.vue |  6 ++----
 .../pages/udf/pages/resource/_source/list.vue         |  2 +-
 .../pages/resource/pages/udf/pages/resource/index.vue |  9 ++++++---
 .../js/conf/home/pages/security/pages/queue/index.vue |  4 ++--
 .../pages/security/pages/tenement/_source/list.vue    |  2 +-
 .../conf/home/pages/security/pages/tenement/index.vue |  8 ++++++--
 .../home/pages/security/pages/users/_source/list.vue  |  2 +-
 .../js/conf/home/pages/security/pages/users/index.vue |  8 ++++++--
 .../security/pages/warningGroups/_source/list.vue     |  2 +-
 .../home/pages/security/pages/warningGroups/index.vue |  8 ++++++--
 .../security/pages/workerGroups/_source/list.vue      |  2 +-
 .../home/pages/security/pages/workerGroups/index.vue  | 10 +++++++---
 .../conf/home/pages/user/pages/token/_source/list.vue |  2 +-
 .../src/js/conf/home/pages/user/pages/token/index.vue | 11 ++++++++---
 .../src/js/module/components/listBoxF/listBoxF.vue    |  2 +-
 .../src/js/module/components/nav/nav.vue              |  2 +-
 27 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index ebf296d11c..ef6f83912f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -148,7 +148,7 @@
         this.deleteDatasource({
           id: item.id
         }).then(res => {
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$message.error(e.msg || '')
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
index 5f746b0c68..19640ccd38 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@@ -24,13 +24,13 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="datasourcesList.length">
-        <m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
+      <template v-if="datasourcesList.length || total>0">
+        <m-list @on-update="_onUpdate" :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!datasourcesList.length">
+      <template v-if="!datasourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading" :is-left="false">
@@ -131,7 +131,10 @@
         }).catch(e => {
           this.isLoading = false
         })
-      }
+      },
+      _onUpdate () {
+        this._debounceGET('false')
+      },
     },
     watch: {
       // router
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
index 79713816c5..2c100e2d98 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
@@ -60,7 +60,7 @@
       height: 276px;
       line-height: 276px;
       text-align: center;
-      >b {
+      >strong {
         font-size: 100px;
         color: #333;
       }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
index b5ace15bff..08a964ff55 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
@@ -20,14 +20,14 @@
       <m-conditions @on-query="_onQuery"></m-conditions>
     </template>
     <template slot="content">
-      <template v-if="taskRecordList.length">
+      <template v-if="taskRecordList.length || total>0">
         <m-list :task-record-list="taskRecordList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
         </m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
         </div>
       </template>
-      <template v-if="!taskRecordList.length">
+      <template v-if="!taskRecordList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
index a33c01f54e..d168ce7657 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@@ -26,13 +26,13 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="processListP.length">
+      <template v-if="processListP.length || total>0">
         <m-list :process-list="processListP" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!processListP.length">
+      <template v-if="!processListP.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index 5c628a1d47..4bf169b854 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -20,14 +20,14 @@
       <m-instance-conditions @on-query="_onQuery"></m-instance-conditions>
     </template>
     <template slot="content">
-      <template v-if="processInstanceList.length">
+      <template v-if="processInstanceList.length || total>0">
         <m-list :process-instance-list="processInstanceList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
         </m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!processInstanceList.length">
+      <template v-if="!processInstanceList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
index f1b90ed666..bf5bc12690 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
@@ -152,7 +152,7 @@
           projectId: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
@@ -165,7 +165,8 @@
        */
       _edit (item) {
         findComponentDownward(this.$root, 'projects-list')._create(item)
-      }
+      },
+
     },
     watch: {
       projectsList (a) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
index 0e1bb7cf3f..74121f5f5a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
@@ -24,13 +24,13 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="projectsList.length">
+      <template v-if="projectsList.length || total>0">
         <m-list :projects-list="projectsList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!projectsList.length">
+      <template v-if="!projectsList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading" :is-left="false"></m-spin>
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 8841c42fac..513d0d1321 100644
--- 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
@@ -166,7 +166,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index a6e0f9fba6..de7f773866 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -27,14 +27,14 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="fileResourcesList.length">
-        <m-list :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
+      <template v-if="fileResourcesList.length || total>0">
+        <m-list @on-update="_onUpdate" :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
         </m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!fileResourcesList.length">
+      <template v-if="!fileResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading">
@@ -102,6 +102,9 @@
         this.searchParams.pageNo = 1
         this.searchParams.searchVal = ''
         this._debounceGET()
+      },
+       _onUpdate () {
+        this._debounceGET()
       }
     },
     watch: {
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 a4558c78d6..febb215741 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
@@ -142,7 +142,7 @@ v-ps<template>
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('_updateList')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index c04018aed7..c94a8dc598 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -24,14 +24,14 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="udfFuncList.length">
+      <template v-if="udfFuncList.length || total>0">
         <m-list :udf-func-list="udfFuncList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize" @on-update="_updateList">
         </m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!udfFuncList.length">
+      <template v-if="!udfFuncList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading">
@@ -104,8 +104,6 @@
         })
       },
       _updateList () {
-        this.searchParams.pageNo = 1
-        this.searchParams.searchVal = ''
         this._debounceGET()
       },
       _getList (flag) {
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 da122272df..6337ef488e 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
@@ -151,7 +151,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index e4f76e3409..8b86966510 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -24,14 +24,14 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="udfResourcesList.length">
-        <m-list :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
+      <template v-if="udfResourcesList.length || total>0">
+        <m-list @on-update="_onUpdate" :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
         </m-list>
         <div class="page-box">
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!udfResourcesList.length">
+      <template v-if="!udfResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading">
@@ -85,6 +85,9 @@
       _pageSize (val) {
         this.searchParams.pageSize = val
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _updateList () {
         this.searchParams.pageNo = 1
         this.searchParams.searchVal = ''
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
index 358e9ab480..ed5bf2cb36 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@@ -24,7 +24,7 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="queueList.length">
+      <template v-if="queueList.length || total>0">
         <m-list @on-edit="_onEdit"
                 :queue-list="queueList"
                 :page-no="searchParams.pageNo"
@@ -35,7 +35,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!queueList.length">
+      <template v-if="!queueList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
index 6258f935e5..521b96dd6b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
@@ -135,7 +135,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
index d15a2c6fa2..8063fd0c54 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
@@ -24,8 +24,9 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="tenementList.length">
+      <template v-if="tenementList.length || total>0">
         <m-list @on-edit="_onEdit"
+                @on-update="_onUpdate"
                 :tenement-list="tenementList"
                 :page-no="searchParams.pageNo"
                 :page-size="searchParams.pageSize">
@@ -35,7 +36,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!tenementList.length">
+      <template v-if="!tenementList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
@@ -86,6 +87,9 @@
       _pageSize (val) {
         this.searchParams.pageSize = val
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _onEdit (item) {
         this._create(item)
       },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 7ed786c1a5..6e8887b343 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -153,7 +153,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index b457dcb5a0..b137de7f1a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -24,8 +24,9 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="userList.length">
+      <template v-if="userList.length || total>0">
         <m-list @on-edit="_onEdit"
+                @on-update="_onUpdate"
                 :user-list="userList"
                 :page-no="searchParams.pageNo"
                 :page-size="searchParams.pageSize">
@@ -35,7 +36,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!userList.length">
+      <template v-if="!userList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
@@ -84,6 +85,9 @@
       _pageSize (val) {
         this.searchParams.pageSize = val
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _onEdit (item) {
         this._create(item)
       },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index cac2cf1ec8..a27e4dab1d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -115,7 +115,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
index 9e4943c424..76bbc32c7f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
@@ -24,8 +24,9 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="alertgroupList.length">
+      <template v-if="alertgroupList.length || total>0">
         <m-list @on-edit="_onEdit"
+                @on-update="_onUpdate"
                 :alertgroup-list="alertgroupList"
                 :page-no="searchParams.pageNo"
                 :page-size="searchParams.pageSize">
@@ -35,7 +36,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!alertgroupList.length">
+      <template v-if="!alertgroupList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
@@ -86,6 +87,9 @@
       _pageSize (val) {
         this.searchParams.pageSize = val
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _onEdit (item) {
         this._create(item)
       },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
index caf2cf6662..edfdee20b1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
@@ -106,7 +106,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
index 9bdc354114..10f493261c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
@@ -24,8 +24,9 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="workerGroupList.length">
-        <m-list @on-edit="_onEdit"
+      <template v-if="workerGroupList.length || total>0">
+        <m-list @on-update="_onUpdate"
+                @on-edit="_onEdit"
                 :worker-group-list="workerGroupList"
                 :page-no="searchParams.pageNo"
                 :page-size="searchParams.pageSize">
@@ -34,7 +35,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!workerGroupList.length">
+      <template v-if="!workerGroupList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
@@ -85,6 +86,9 @@
       _pageSize (val) {
         this.searchParams.pageSize = val
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _onEdit (item) {
         this._create(item)
       },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
index d35e56bc5b..9507d6dc7f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
@@ -111,7 +111,7 @@
           id: item.id
         }).then(res => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
-          this.list.splice(i, 1)
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-delete-${i}`][0].doClose()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
index f4044d5b8f..a9fbeb0112 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@@ -24,8 +24,10 @@
       </m-conditions>
     </template>
     <template slot="content">
-      <template v-if="tokenList.length">
-        <m-list @on-edit="_onEdit"
+      <template v-if="tokenList.length || total>0">
+        <m-list 
+                @on-update="_onUpdate"
+                @on-edit="_onEdit"
                 :token-list="tokenList"
                 :page-no="searchParams.pageNo"
                 :page-size="searchParams.pageSize">
@@ -35,7 +37,7 @@
           <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
         </div>
       </template>
-      <template v-if="!tokenList.length">
+      <template v-if="!tokenList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
       <m-spin :is-spin="isLoading"></m-spin>
@@ -88,6 +90,9 @@
       _onEdit (item) {
         this._create(item)
       },
+      _onUpdate () {
+        this._debounceGET()
+      },
       _create (item) {
         let self = this
         let modal = this.$modal.dialog({
diff --git a/dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue b/dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
index 04b2c65093..36c7027663 100644
--- a/dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
+++ b/dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
@@ -42,7 +42,7 @@
       text-align: right;
       line-height: 32px;
       padding-right: 8px;
-      >b {
+      >strong {
         color: #ff0000;
         padding-right: 4px;
       }
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
index 6d6170476f..7212f5146a 100644
--- a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
+++ b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
@@ -431,7 +431,7 @@
         margin-right: 20px;
         cursor: pointer;
         margin-top: 16px;
-        i {
+        em {
           font-size: 18px;
           vertical-align: middle;
           color: #fff;